diff options
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/cmake/Requests.cmake | 6 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index 5ad0b66336..b6a494f515 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2806,7 +2806,7 @@ <key>license</key> <string>Apache</string> <key>license_file</key> - <string>LICENSE</string> + <string>requests.txt</string> <key>name</key> <string>requests</string> <key>platforms</key> @@ -2816,9 +2816,9 @@ <key>archive</key> <map> <key>hash</key> - <string>14a3c749f78e8489c7291c35fe997f2e</string> + <string>20a84252b40223d5c08a6c1575b3333b</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4022/11166/requests-1.0-darwin64-504010.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4106/11536/requests-1.0-darwin64-504094.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -2828,9 +2828,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7b7f5985cad7917451f9482d0727b380</string> + <string>a92f2235991871c3d601a73cfef9b2af</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4021/11161/requests-1.0-linux64-504010.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4105/11530/requests-1.0-linux64-504094.tar.bz2</string> </map> <key>name</key> <string>linux64</string> 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) |