[llvm-commits] [compiler-rt] r85339 - in /compiler-rt/trunk: CMakeLists.txt cmake/Modules/MacroAddCheckTest.cmake test/CMakeLists.txt

[Edward O'Callaghan]

Author: evocallaghan
Date: Tue Oct 27 18:23:41 2009
New Revision: 85339

URL: http://llvm.org/viewvc/llvm-project?rev=85339&view=rev
Log:
Fix cmake test suit for compiler-rt.

Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/cmake/Modules/MacroAddCheckTest.cmake
    compiler-rt/trunk/test/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=85339&r1=85338&r2=85339&view=diff

==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue Oct 27 18:23:41 2009
@@ -50,5 +50,5 @@
 ADD_SUBDIRECTORY( lib )
 
 # Tests are being ignored for until the very basics are working.
-#INCLUDE( MacroAddCheckTest )
+INCLUDE( MacroAddCheckTest )
 ADD_SUBDIRECTORY( test )

Modified: compiler-rt/trunk/cmake/Modules/MacroAddCheckTest.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/MacroAddCheckTest.cmake?rev=85339&r1=85338&r2=85339&view=diff

==============================================================================
--- compiler-rt/trunk/cmake/Modules/MacroAddCheckTest.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/MacroAddCheckTest.cmake Tue Oct 27 18:23:41 2009
@@ -7,5 +7,6 @@
 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)

Modified: compiler-rt/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/CMakeLists.txt?rev=85339&r1=85338&r2=85339&view=diff

==============================================================================
--- compiler-rt/trunk/test/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/CMakeLists.txt Tue Oct 27 18:23:41 2009
@@ -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)