diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-25 13:35:45 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-25 13:35:45 -0400 |
commit | ceb35372b545cd957f99577ad7076c7f3a65cb97 (patch) | |
tree | 4dfb08a586042d7d98eee4072ac70a1ede5760e2 /indra/cmake | |
parent | b51972bac7f0b11955474baebebd3f1d7c9e60e3 (diff) | |
parent | cc376f86e8496e9e924fd596064c13ee6aa0133e (diff) |
Automated merge with https://bitbucket.org/oz_linden/viewer-release-cmake3.12
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/LLBase.cmake | 4 | ||||
-rw-r--r-- | indra/cmake/Requests.cmake | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/indra/cmake/LLBase.cmake b/indra/cmake/LLBase.cmake deleted file mode 100644 index 76e3c688a3..0000000000 --- a/indra/cmake/LLBase.cmake +++ /dev/null @@ -1,4 +0,0 @@ -# -*- cmake -*- -include(Prebuilt) - -use_prebuilt_binary(llbase) diff --git a/indra/cmake/Requests.cmake b/indra/cmake/Requests.cmake deleted file mode 100644 index b9c729d697..0000000000 --- a/indra/cmake/Requests.cmake +++ /dev/null @@ -1,7 +0,0 @@ -if (DARWIN) - include (Prebuilt) - use_prebuilt_binary(requests) - use_prebuilt_binary(urllib3) - use_prebuilt_binary(chardet) - use_prebuilt_binary(idna) -endif (DARWIN) |