Ver código fonte

BUG: In CMakeLists, change CXX_TEST_PATH into CPP_TEST_PATH and set its value correctly

Jean-Christophe Fillion-Robin 15 anos atrás
pai
commit
763f7343ee

+ 2 - 2
Applications/ctkDICOM/Testing/Cpp/CMakeLists.txt

@@ -11,9 +11,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Applications/ctkDICOMIndexer/Testing/Cpp/CMakeLists.txt

@@ -11,9 +11,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 1 - 1
CMakeLists.txt

@@ -124,7 +124,7 @@ OPTION(BUILD_TESTING "Test the project" ON)
 IF(BUILD_TESTING)
   ENABLE_TESTING()
   INCLUDE(CTest)
-  SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
+  SET(CPP_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
   MARK_AS_ADVANCED(TCL_TCLSH DART_ROOT)
     
   # Setup file for setting custom ctest vars

+ 2 - 2
Libs/Core/Testing/Cpp/CMakeLists.txt

@@ -22,9 +22,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt

@@ -13,9 +13,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -11,9 +11,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/Scripting/Python/Core/Testing/Cpp/CMakeLists.txt

@@ -13,9 +13,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/Scripting/Python/Widgets/Testing/Cpp/CMakeLists.txt

@@ -13,9 +13,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/Visualization/VTK/Core/Testing/Cpp/CMakeLists.txt

@@ -51,9 +51,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests} ${KIT_HELPER_SRCS})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/Visualization/VTK/Widgets/Testing/Cpp/CMakeLists.txt

@@ -13,9 +13,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/Visualization/XIP/Testing/Cpp/CMakeLists.txt

@@ -11,9 +11,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )

+ 2 - 2
Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -26,9 +26,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
-SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CppTests)
+SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
 IF(WIN32)
-  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
+  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )