summaryrefslogtreecommitdiff
path: root/indra/cmake/LLAddBuildTest.cmake
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-12-17 00:09:01 +0100
committerKitty Barnett <develop@catznip.com>2012-12-17 00:09:01 +0100
commit5824e60c595a3004ba24c250cad72a5eace8013f (patch)
treea3f6839f56c3b19b59eb3509423354ebd12d4814 /indra/cmake/LLAddBuildTest.cmake
parenta18ea9d92923e331c0a3e179e126659e694b1c07 (diff)
parent74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (diff)
Merge with viewer-materials tip
Diffstat (limited to 'indra/cmake/LLAddBuildTest.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