diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-08-04 21:35:57 +0000 |
| commit | 8fe0084108202f307291d5d9be586e5186c2b1de (patch) | |
| tree | ade28d7acd7eaf455657260db2b1dc5768e475e4 /indra/cmake/LLAddBuildTest.cmake | |
| parent | 9fb96b416f0612882ddcaa658945a5b3f73ff331 (diff) | |
| parent | 9a8b1552f0fbff3cde1c8fa5e24924e237008814 (diff) | |
Merge. Refresh from viewer-library-refresh after 3.7.13 release.
Diffstat (limited to 'indra/cmake/LLAddBuildTest.cmake')
| -rw-r--r--[-rwxr-xr-x] | indra/cmake/LLAddBuildTest.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 068aeea212..804624f5ec 100755..100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -202,9 +202,9 @@ FUNCTION(LL_ADD_INTEGRATION_TEST ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files}) SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}") - if(STANDALONE) + if(USESYSTEMLIBS) SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}") - endif(STANDALONE) + endif(USESYSTEMLIBS) # The following was copied to llcorehttp/CMakeLists.txt's texture_load target. # Any changes made here should be replicated there. @@ -275,10 +275,10 @@ MACRO(SET_TEST_PATH LISTVAR) set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib) ELSE(WINDOWS) # Linux uses a single staging directory anyway. - IF (STANDALONE) + IF (USESYSTEMLIBS) set(${LISTVAR} ${CMAKE_BINARY_DIR}/llcommon /usr/lib /usr/local/lib) - ELSE (STANDALONE) + ELSE (USESYSTEMLIBS) set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib) - ENDIF (STANDALONE) + ENDIF (USESYSTEMLIBS) ENDIF(WINDOWS) ENDMACRO(SET_TEST_PATH) |