diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-04-07 11:51:10 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-04-07 11:51:10 -0700 |
| commit | 5ae67d8dcd05f2b9bb82ddc07a26e492946da420 (patch) | |
| tree | d7fb863e08bc4a72e96ce858b6ab77d46af60640 /indra | |
| parent | 9770519a6e7f542cdfb95c996897f274933ad08f (diff) | |
MAINT-7282: add requests module and associated build machinery
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Requests.cmake | 6 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/cmake/Requests.cmake b/indra/cmake/Requests.cmake index b8fcaf4764..84ee070813 100644 --- a/indra/cmake/Requests.cmake +++ b/indra/cmake/Requests.cmake @@ -1,2 +1,4 @@ -include (Prebuilt) -use_prebuilt_binary(requests) +if (DARWIN) + include (Prebuilt) + use_prebuilt_binary(requests) +endif (DARWIN) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7a62d8baec..fa53b5a45d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -43,6 +43,7 @@ include(OPENAL) include(OpenGL) include(OpenSSL) include(PNG) +include(Requests) include(TemplateCheck) include(UI) include(UnixInstall) |