浏览代码

Remove code related to CTK_EXTERNAL_LIBRARY_DIRS

Following the build system refactoring introduced by commit 82e42560, the
variable 'CTK_EXTERNAL_LIBRARY_DIRS' was always configured to an empty
string. Given the facts that (1) this bug introduced now two years ago
was not a "real" issue and that (2) projects like ITK and VTK now export
targets, there is no need to keep this variable around.

See #418
Jean-Christophe Fillion-Robin 11 年之前
父节点
当前提交
364b921e89

+ 0 - 2
CMake/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -159,8 +159,6 @@ foreach(lib ${CTK_LIBRARIES})
 endforeach()
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# External project libraries\n")
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_EXTERNAL_LIBRARIES \"${CTK_EXTERNAL_LIBRARIES}\")\n")
-set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# External project library directories\n")
-set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_EXTERNAL_LIBRARY_DIRS \"${CTK_EXTERNAL_LIBRARY_DIRS}\")\n")
 if(DEFINED DCMTK_HAVE_CONFIG_H_OPTIONAL AND NOT DCMTK_HAVE_CONFIG_H_OPTIONAL AND TARGET CTKDICOMCore)
   set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# Definition required to build DCMTK dependent libraries\n")
   set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}if(\"\${CMAKE_VERSION}\" VERSION_GREATER 2.8.10)\n")

+ 0 - 3
CMake/UseCTK.cmake.in

@@ -30,9 +30,6 @@ IF(NOT CTK_USE_FILE_INCLUDED)
   # Add include directories needed to use CTK.
   INCLUDE_DIRECTORIES(${CTK_INCLUDE_DIRS})
 
-  # Add link directories needed to use CTK.
-  # LINK_DIRECTORIES(${CTK_LIBRARY_DIRS} ${CTK_EXTERNAL_LIBRARY_DIRS})
-
   if (NOT DEFINED QT_QMAKE_EXECUTABLE)
     set(QT_QMAKE_EXECUTABLE ${CTK_QT_QMAKE_EXECUTABLE})
   endif()

+ 0 - 16
CMakeExternals/DCMTK.cmake

@@ -72,22 +72,6 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     )
   set(DCMTK_DIR ${ep_install_dir})
 
-# This was used during heavy development on DCMTK itself.
-# Disabling it for now. (It also leads to to build errors
-# with the XCode CMake generator on Mac).
-#
-#    ExternalProject_Add_Step(${proj} force_rebuild
-#      COMMENT "Force ${proj} re-build"
-#      DEPENDERS build    # Steps that depend on this step
-#      ALWAYS 1
-#      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${proj}-build
-#      DEPENDS
-#        ${proj_DEPENDENCIES}
-#      )
-
-  # Since DCMTK is statically build, there is not need to add its corresponding
-  # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 4
CMakeExternals/ITK.cmake

@@ -69,10 +69,6 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     )
   set(ITK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
-  # Since the link directories associated with ITK is used, it makes sens to
-  # update CTK_EXTERNAL_LIBRARY_DIRS with its associated library output directory
-  list(APPEND CTK_EXTERNAL_LIBRARY_DIRS ${ITK_DIR}/bin)
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 2
CMakeExternals/KWStyle.cmake

@@ -46,8 +46,6 @@ if(NOT DEFINED KWSTYLE_EXECUTABLE)
     )
   set(KWSTYLE_EXECUTABLE ${ep_install_dir}/bin/KWStyle)
 
-  # Since KWStyle is an executable, there is not need to add its corresponding
-  # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 3
CMakeExternals/Log4Qt.cmake

@@ -53,9 +53,6 @@ if(NOT DEFINED Log4Qt_DIR)
     )
   set(Log4Qt_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
-  # Since Log4Qt is statically build, there is not need to add its corresponding
-  # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 3
CMakeExternals/PythonQt.cmake

@@ -84,9 +84,6 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     )
   set(PYTHONQT_INSTALL_DIR ${ep_install_dir})
 
-  # Since the full path of PythonQt library is used, there is not need to add
-  # its corresponding library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 3
CMakeExternals/PythonQtGenerator.cmake

@@ -46,9 +46,6 @@ if(NOT DEFINED PYTHONQTGENERATOR_EXECUTABLE)
 
   set(PYTHONQTGENERATOR_EXECUTABLE ${CMAKE_BINARY_DIR}/PythonQtGenerator-build/PythonQtGenerator)
 
-  # Since PythonQtGenerator is an executable, there is no need to add its corresponding
-  # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 3
CMakeExternals/QtSOAP.cmake

@@ -54,9 +54,6 @@ if(NOT DEFINED QtSOAP_DIR)
     )
   set(QtSOAP_DIR "${CMAKE_BINARY_DIR}/${proj}-build")
 
-  # Since the QtSOAP dll is created directly in CTK-build/bin, there is not need to add a
-  # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 3
CMakeExternals/QtTesting.cmake

@@ -66,9 +66,6 @@ if(NOT DEFINED QtTesting_DIR)
   set(QtTesting_INSTALL_DIR ${ep_install_dir})
   set(QtTesting_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
-  # Since QtTesting is statically build, there is not need to add its corresponding
-  # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 4
CMakeExternals/VTK.cmake

@@ -78,10 +78,6 @@ if(NOT DEFINED VTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     )
   set(VTK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
 
-  # Since the link directories associated with VTK is used, it makes sens to
-  # update CTK_EXTERNAL_LIBRARY_DIRS with its associated library output directory
-  list(APPEND CTK_EXTERNAL_LIBRARY_DIRS ${VTK_DIR}/bin)
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 3
CMakeExternals/qxmlrpc.cmake

@@ -52,9 +52,6 @@ if(NOT DEFINED qxmlrpc_DIR)
     )
   set(qxmlrpc_DIR "${CMAKE_BINARY_DIR}/${proj}-build")
 
-  # Since qxmlrpc is statically build, there is not need to add its corresponding
-  # library output directory to CTK_EXTERNAL_LIBRARY_DIRS
-
 else()
   superbuild_add_empty_external_project(${proj} "${${proj}_DEPENDENCIES}")
 endif()

+ 0 - 9
SuperBuild.cmake

@@ -25,14 +25,6 @@
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
-# Declare CTK_EXTERNAL_LIBRARY_DIRS variable - This variable stores
-# the library output directory associated with the different external project
-# It's then used in CMake/LastConfigureStep/CTKGenerateCTKConfig.cmake to
-# configure CTKConfig.cmake.in
-# This variable would then be exposed to project building against CTK
-set(CTK_EXTERNAL_LIBRARY_DIRS)
-
-#-----------------------------------------------------------------------------
 # Make sure ${CTK_BINARY_DIR}/CTK-build/bin exists
 # May be used by some external project to install libs 
 if(NOT EXISTS ${CTK_BINARY_DIR}/CTK-build/bin)
@@ -55,7 +47,6 @@ ExternalProject_Add(${proj}
     -DCMAKE_CXX_FLAGS_INIT:STRING=${CMAKE_CXX_FLAGS_INIT}
     -DCMAKE_C_FLAGS_INIT:STRING=${CMAKE_C_FLAGS_INIT}
     -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-    -DCTK_EXTERNAL_LIBRARY_DIRS:STRING=${CTK_EXTERNAL_LIBRARY_DIRS}
   SOURCE_DIR ${CTK_SOURCE_DIR}
   BINARY_DIR ${CTK_BINARY_DIR}/CTK-build
   INSTALL_COMMAND ""