diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/Modules/MacroAddCheckTest.cmake | 3 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe0821a6..4e6f5656 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,5 +50,5 @@ ENDIF( BUILD_BLOCKS_RUNTIME ) ADD_SUBDIRECTORY( lib ) # Tests are being ignored for until the very basics are working. -#INCLUDE( MacroAddCheckTest ) +INCLUDE( MacroAddCheckTest ) ADD_SUBDIRECTORY( test ) diff --git a/cmake/Modules/MacroAddCheckTest.cmake b/cmake/Modules/MacroAddCheckTest.cmake index 266ed0fb..a1391218 100644 --- a/cmake/Modules/MacroAddCheckTest.cmake +++ b/cmake/Modules/MacroAddCheckTest.cmake @@ -7,5 +7,6 @@ set(CMAKE_C_FLAGS_PROFILING "-g -pg") macro (MACRO_ADD_CHECK_TEST _testName _testSource) add_executable(${_testName} ${_testSource}) target_link_libraries(${_testName} ${ARGN}) - add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}) + get_target_property(_targetLocation ${_testName} LOCATION) + add_test(${_testName} ${_targetLocation}) endmacro (MACRO_ADD_CHECK_TEST) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dedcde90..c8486b80 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,7 @@ PROJECT( tests C ) SET( CompilerRT_LIBRARY CompilerRT ) +INCLUDE_DIRECTORIES(${CompilerRT_SOURCE_DIR}/lib) # create test library # add_library(${CompilerRT_LIBRARY} STATIC support.c cmdline.c) |