summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-11 17:04:23 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-11 17:04:23 -0800
commit74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (patch)
treecde4b149fe66bbc08bfcd4c1e2f572f5402fc8c6 /indra/cmake
parent44abb8c3bf4ae3edc871583bd1fa19f10c72fdf1 (diff)
parentedcdce226a7ff599e43c89fe7e4d37350650ae96 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/LLAddBuildTest.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index afae38b51c..21a0c8a9ca 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -206,6 +206,8 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}")
endif(STANDALONE)
+ # The following was copied to llcorehttp/CMakeLists.txt's texture_load target.
+ # Any changes made here should be replicated there.
if (WINDOWS)
SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
PROPERTIES