|
@@ -18,11 +18,6 @@
|
|
|
#
|
|
|
###########################################################################
|
|
|
|
|
|
-SET(cmake_version_required "2.8")
|
|
|
-SET(cmake_version_required_dash "2-8")
|
|
|
-
|
|
|
-CMAKE_MINIMUM_REQUIRED(VERSION ${cmake_version_required})
|
|
|
-
|
|
|
#
|
|
|
# CTK_KWSTYLE_EXECUTABLE
|
|
|
# DCMTK_DIR
|
|
@@ -72,11 +67,6 @@ ENDIF()
|
|
|
set(sep "^^")
|
|
|
|
|
|
#-----------------------------------------------------------------------------
|
|
|
-# Update CMake module path
|
|
|
-#
|
|
|
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/CMake)
|
|
|
-
|
|
|
-#-----------------------------------------------------------------------------
|
|
|
# Collect CTK library target dependencies
|
|
|
#
|
|
|
|
|
@@ -221,10 +211,10 @@ ExternalProject_Add(${proj}
|
|
|
-DCTK_KWSTYLE_EXECUTABLE:FILEPATH=${CTK_KWSTYLE_EXECUTABLE}
|
|
|
-DDCMTK_DIR:PATH=${DCMTK_DIR} # FindDCMTK expects DCMTK_DIR variable to be defined
|
|
|
-DVTK_DIR:PATH=${VTK_DIR} # FindVTK expects VTK_DIR variable to be defined
|
|
|
- -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} # FindPythonQt expects PYTHON_INCLUDE_DIR variable to be defined
|
|
|
- -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} # FindPythonQt expects PYTHON_LIBRARY variable to be defined
|
|
|
+ -DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} # FindPythonQt expects PYTHON_INCLUDE_DIR variable to be defined
|
|
|
+ -DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} # FindPythonQt expects PYTHON_LIBRARY variable to be defined
|
|
|
-DPYTHONQT_INSTALL_DIR:PATH=${PYTHONQT_INSTALL_DIR} # FindPythonQt expects PYTHONQT_INSTALL_DIR variable to be defined
|
|
|
- -Dlog4qt_DIR:PATH=${log4qt_DIR} # Findlog4qt expects a log4qt_DIR variable to be defined
|
|
|
+ -Dlog4qt_DIR:PATH=${log4qt_DIR} # Findlog4qt expects log4qt_DIR variable to be defined
|
|
|
SOURCE_DIR ${CTK_SOURCE_DIR}
|
|
|
BINARY_DIR ${CTK_BINARY_DIR}/CTK-build
|
|
|
BUILD_COMMAND ""
|