Browse Source

ENH: In Testing/CMakeLists.txt of Libs/{Core,Widgets}, use PROJECT_NAME instead of the equivalent hardcoded value.

Jean-Christophe Fillion-Robin 15 years ago
parent
commit
331c559326
2 changed files with 6 additions and 6 deletions
  1. 1 1
      Libs/Core/Testing/CMakeLists.txt
  2. 5 5
      Libs/DICOM/Core/Testing/CMakeLists.txt

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

@@ -1,4 +1,4 @@
-SET(KIT CTKCore)
+SET(KIT ${PROJECT_NAME})
 
 CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
   ctkUtilsTest1.cxx

+ 5 - 5
Libs/DICOM/Core/Testing/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(KIT CTKDICOMCore)
+SET(KIT ${PROJECT_NAME})
 
 CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
   ctkDICOMModelTest1.cxx
@@ -13,9 +13,9 @@ SET(LIBRARY_NAME ${PROJECT_NAME})
 ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
 
-SET( CTKDICOMCore_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
+SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
 IF(WIN32)
-  SET(CTKDICOMCore_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
+  SET(KIT_TESTS ${CXX_TEST_PATH}/${CMAKE_BUILD_TYPE}/${KIT}CxxTests)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )
@@ -26,10 +26,10 @@ ENDMACRO( SIMPLE_TEST  )
 # Add Tests
 #
 
-ADD_TEST( ctkDICOMModelTest1 ${CTKDICOMCore_TESTS}
+ADD_TEST( ctkDICOMModelTest1 ${KIT_TESTS}
           ctkDICOMModelTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
                              ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/dicom-sample.sql)
 
-ADD_TEST( ctkDICOMTest1 ${CTKDICOMCore_TESTS}
+ADD_TEST( ctkDICOMTest1 ${KIT_TESTS}
           ctkDICOMTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db
                         ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/dicom-sample.sql)