浏览代码

FIX: Testing: Manually adding CMAKE_BUILD_TYPE to the path of the testing
executable is not necessary. CTest appends the correct output directory
dependening on the build type itself. Now the tests can also be
executed on MinGW systems.

Sascha Zelzer 14 年之前
父节点
当前提交
aa252c01c1

+ 0 - 3
Libs/Core/Testing/Cpp/CMakeLists.txt

@@ -45,9 +45,6 @@ ADD_EXECUTABLE(${KIT}CppTests ${Tests} ${Tests_SRCS} ${MY_MOC_CXX})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
 SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-IF(WIN32)
-  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
-ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )
   ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )

+ 0 - 3
Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt

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

+ 0 - 3
Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

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

+ 0 - 3
Libs/Messaging/Core/Testing/CMakeLists.txt

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

+ 0 - 3
Libs/PluginFramework/Testing/Cpp/CMakeLists.txt

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

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

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

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

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

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

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

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

@@ -42,9 +42,6 @@ ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
 SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-IF(WIN32)
-  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
-ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )
   ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} -D "${CTKData_DIR}/Data")

+ 0 - 3
Libs/Visualization/XIP/Testing/Cpp/CMakeLists.txt

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

+ 0 - 3
Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -52,9 +52,6 @@ ADD_EXECUTABLE(${KIT}CppTests ${Tests} ${Tests_SRCS} ${MY_MOC_CXX})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
 
 SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
-IF(WIN32)
-  SET(KIT_TESTS ${CPP_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CppTests)
-ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )
   ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )