diff options
| author | JJ Linden <jj@lindenlab.com> | 2014-10-13 12:46:55 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2014-10-13 12:46:55 -0700 |
| commit | 5cb5c267caed96b23e1c6c7b8d3c04aaefe84c6a (patch) | |
| tree | e238dd104c9a478c7b753713ce1cfc30f835340d /indra/test | |
| parent | 4fb1bae807a5dd8a342946b8f23d2a7a5aa5d36a (diff) | |
fixes for cmake warnings about policy changes. could not fully test these changes
Diffstat (limited to 'indra/test')
| -rwxr-xr-x | indra/test/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index 62b1d9db62..01d1d830a2 100755 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -1,6 +1,6 @@ # -*- cmake -*- -project (test) +project (lltest) include(00-Common) include(LLCommon) @@ -80,9 +80,9 @@ set_source_files_properties(${test_HEADER_FILES} list(APPEND test_SOURCE_FILES ${test_HEADER_FILES}) -add_executable(test ${test_SOURCE_FILES}) +add_executable(lltest ${test_SOURCE_FILES}) -target_link_libraries(test +target_link_libraries(lltest ${LLDATABASE_LIBRARIES} ${LLINVENTORY_LIBRARIES} ${LLMESSAGE_LIBRARIES} @@ -102,14 +102,14 @@ target_link_libraries(test ) if (WINDOWS) - set_target_properties(test + set_target_properties(lltest PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\"" ) endif (WINDOWS) -get_target_property(TEST_EXE test LOCATION) +set(TEST_EXE $<TARGET_FILE:lltest>) SET_TEST_PATH(DYLD_LIBRARY_PATH) @@ -122,7 +122,7 @@ LL_TEST_COMMAND(command ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cpp_tests_ok.txt COMMAND ${command} - DEPENDS test + DEPENDS lltest WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "C++ unit tests" ) |