Selaa lähdekoodia

BUG: CXX_TEST_PATH is now properly set in CMakeLists.txt

Jean-Christophe Fillion-Robin 15 vuotta sitten
vanhempi
commit
9c51aa91de
2 muutettua tiedostoa jossa 2 lisäystä ja 3 poistoa
  1. 1 2
      CMakeLists.txt
  2. 1 1
      Libs/Core/Testing/CMakeLists.txt

+ 1 - 2
CMakeLists.txt

@@ -20,7 +20,6 @@ IF(NOT EXECUTABLE_OUTPUT_PATH)
 ENDIF(NOT EXECUTABLE_OUTPUT_PATH)
 SET(CTK_LIBRARY_PATH ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 SET(CTK_EXECUTABLE_PATH ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
-SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
 #-----------------------------------------------------------------------------
 # Install directories, used for install rules.
@@ -56,7 +55,7 @@ OPTION(BUILD_TESTING "Test the project" ON)
 IF(BUILD_TESTING)
   ENABLE_TESTING()
   INCLUDE(CTest)
-  SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
   MARK_AS_ADVANCED(TCL_TCLSH DART_ROOT)
     
   # Setup file for setting custom ctest vars

+ 1 - 1
Libs/Core/Testing/CMakeLists.txt

@@ -19,7 +19,7 @@ IF(WIN32)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )
-  ADD_TEST( ${TESTNAME} ${LAUNCH_EXE} ${KIT_TESTS} ${TESTNAME} )
+  ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
 ENDMACRO( SIMPLE_TEST  )
 
 #