diff options
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 610aa99dc9..0edacac7a9 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -181,7 +181,7 @@ endif (DARWIN) if (LINUX OR DARWIN) - set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") + set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor") if (NOT GCC_DISABLE_FATAL_WARNINGS) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 7cfdead32e..3557a99248 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -69,8 +69,13 @@ MACRO(ADD_SIMULATOR_BUILD_TEST name parent) ENDMACRO(ADD_SIMULATOR_BUILD_TEST name parent) MACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files) - - ADD_EXECUTABLE(${name}_test ${source_files}) + SET(TEST_SOURCE_FILES ${source_files}) + SET(HEADER "${name}.h") + set_source_files_properties(${HEADER} + PROPERTIES HEADER_FILE_ONLY TRUE) + LIST(APPEND TEST_SOURCE_FILES ${HEADER}) + INCLUDE_DIRECTORIES("${LIBS_OPEN_DIR}/test") + ADD_EXECUTABLE(${name}_test ${TEST_SOURCE_FILES}) TARGET_LINK_LIBRARIES(${name}_test ${libraries} ) @@ -80,11 +85,11 @@ MACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files) ADD_CUSTOM_COMMAND( OUTPUT ${TEST_OUTPUT} COMMAND ${TEST_EXE} - ARGS --touch=${TEST_OUTPUT} + ARGS --touch=${TEST_OUTPUT} --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${name}_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) ADD_CUSTOM_TARGET(${name}_test_ok ALL DEPENDS ${TEST_OUTPUT}) ADD_DEPENDENCIES(${parent} ${name}_test_ok) -ENDMACRO(ADD_BUILD_TEST_INTERNAL name parent libraries)
\ No newline at end of file +ENDMACRO(ADD_BUILD_TEST_INTERNAL name parent libraries) |