Commit fbabbf3f authored by jcfr's avatar jcfr
Browse files

COMP: Remove ref to KWWidgets, Slicer_USE_PYTHON, Slicer_BUILD_MODULES, ...

KWWidgets external project has been removed

Reference to Slicer_USE_PYTHON have been removed

Reference to Slicer_BUILD_MODULES has been removed

Launcher.tcl also has been cleaned

Deprecated function from qSlicerCoreApplication have been removed

Reference to Tcl wrapping within the core component of Slicer have been
removed. note that Slicer/Libs haven't been updated. Indeed, in case other
project want to benefit from Tcl wrapping ...

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15923 3bd1e089-480b-0410-8dfb-8563597acbee
parent 08b6f1f0
......@@ -4,10 +4,6 @@ IF(Slicer_BUILD_CLI)
ADD_SUBDIRECTORY(CLI)
ENDIF(Slicer_BUILD_CLI)
IF (Slicer_USE_KWWIDGETS)
ADD_SUBDIRECTORY(GUI)
ENDIF (Slicer_USE_KWWIDGETS)
IF(Slicer_USE_QT)
ADD_SUBDIRECTORY(SlicerQT)
ENDIF(Slicer_USE_QT)
......
......@@ -121,12 +121,6 @@ SET_SOURCE_FILES_PROPERTIES(
WRAP_EXCLUDE
)
# --------------------------------------------------------------------------
# TCL Wrapping
IF (VTK_WRAP_TCL)
VTK_WRAP_TCL3(SlicerBaseLogic SlicerBaseLogic_TCL_SRCS "${SlicerBaseLogic_SRCS}" "")
ENDIF (VTK_WRAP_TCL)
# --------------------------------------------------------------------------
## Create an instantiator for these classes
# SET(VTK_USE_INSTANTIATOR_NEW 1)
......@@ -145,10 +139,6 @@ set(lib_name SlicerBaseLogic)
#SET(srcs ${SlicerBaseLogic_SRCS} ${Instantiator_SRCS})
SET(srcs ${SlicerBaseLogic_SRCS})
IF (VTK_WRAP_TCL)
SET(srcs ${srcs} ${SlicerBaseLogic_TCL_SRCS})
ENDIF (VTK_WRAP_TCL)
ADD_LIBRARY(${lib_name} ${srcs})
SET(VTK_LIBRARIES
......@@ -181,16 +171,6 @@ ENDIF()
TARGET_LINK_LIBRARIES(${lib_name} ${libs})
SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LABELS ${lib_name})
IF(Slicer_USE_KWWIDGETS)
TARGET_LINK_LIBRARIES(${lib_name} ${KWWidgets_LIBRARIES})
ENDIF()
IF (VTK_WRAP_TCL)
FOREACH(c ${VTK_LIBRARIES})
TARGET_LINK_LIBRARIES(${lib_name} ${c}TCL)
ENDFOREACH(c)
ENDIF()
slicer3_get_persistent_property(Slicer_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer_Base_LIBRARIES ${tmp} ${lib_name})
......
......@@ -652,23 +652,6 @@ bool qSlicerCoreApplication::isInstalled()const
#endif
}
#ifdef Slicer_USE_KWWIDGETS
//-----------------------------------------------------------------------------
CTK_SET_CPP(qSlicerCoreApplication, bool, setInitialized, Initialized);
//-----------------------------------------------------------------------------
CTK_SET_CPP(qSlicerCoreApplication, vtkSlicerApplicationLogic*, setAppLogic, AppLogic);
//-----------------------------------------------------------------------------
void qSlicerCoreApplication::setModuleManager(qSlicerModuleManager* manager)
{
Q_D(qSlicerCoreApplication);
d->ModuleManager = QSharedPointer<qSlicerModuleManager>(manager);
}
#endif //Slicer_USE_KWWIDGETS
//-----------------------------------------------------------------------------
void qSlicerCoreApplication::setMRMLScene(vtkMRMLScene* newMRMLScene)
{
......@@ -841,13 +824,12 @@ QString qSlicerCoreApplication::copyrights()const
"See http://www.na-mic.org/Wiki/index.php/Slicer3:Acknowledgements\n\n"
"VTK http://www.vtk.org/copyright.php\n\n"
"ITK http://www.itk.org/HTML/Copyright.htm\n\n"
"KWWidgets http://www.kitware.com/Copyright.htm\n\n"
"Tcl/Tk http://www.tcl.tk\n\n"
"Teem: http://teem.sf.ne\n\nt"
"Supported by: NA-MIC, NAC, BIRN, NCIGT and the Slicer Community.\n\n"
"Special thanks to the NIH and our other supporters.\n\n"
"This work is part of the National Alliance for Medical Image Computing "
"(NAMIC), funded by the National Institutes of Health through the NIH "
"(NA-MIC), funded by the National Institutes of Health through the NIH "
"Roadmap for Medical Research, Grant U54 EB005149. Information on the "
"National Centers for Biomedical Computing can be obtained from "
"http://nihroadmap.nih.gov/bioinformatics.\n\n");
......
......@@ -29,7 +29,7 @@
#include <ctkVTKObject.h>
// SlicerCore includes
#include "vtkSlicerConfigure.h" // For Slicer_USE_KWWIDGETS, Slicer_USE_PYTHONQT
#include "vtkSlicerConfigure.h" // For Slicer_USE_PYTHONQT
#include "qSlicerBaseQTCoreExport.h"
class QSettings;
......@@ -72,27 +72,6 @@ public:
/// Get MRML Scene
Q_INVOKABLE vtkMRMLScene* mrmlScene() const;
#ifdef Slicer_USE_KWWIDGETS
/// Convenient method allowing to set the initialized flag
/// DEPRECATED: This method was used by the KWWidgests GUI only and it will be
/// removed once the QT GUI is functional. Only vtkSlicerApplication should use
/// that method. Improper use of that function may lead to unstable state
void setInitialized(bool initialized);
/// Set application logic
/// DEPRECATED: This method was used by the KWWidgets GUI only and it will be
/// removed once the QT GUI is functional.
void setAppLogic(vtkSlicerApplicationLogic* appLogic);
/// Set the module manager
/// Note that qSlicerCoreApplication takes ownership of the object
/// DEPRECATED: This method was used by the KWWidgets GUI only and it will be
/// removed once the QT GUI is functional.
void setModuleManager(qSlicerModuleManager* moduleManager);
#endif //Slicer_USE_KWWIDGETS
/// Get application logic
vtkSlicerApplicationLogic* appLogic() const;
......
......@@ -161,10 +161,6 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
# CTK Documentation warning
"CMake Warning at Documentation/CMakeLists.txt:62"
# KWWidgets
"(KWW|kww)idgets.[Uu]tilities.tkdnd"
"(KWW|kww)idgets.vtk(KW|kw)"
# Libs/OpenIGTLink
"(OpenIGTLink|openigtlink).[Ss]ource.igtl"
......
......@@ -120,7 +120,6 @@ Slicer_USE_PYTHON:BOOL=@Slicer_USE_PYTHON@
Teem_DIR:PATH=@Teem_DIR@
SLICERLIBCURL_DIR:PATH=@SLICERLIBCURL_DIR@
ITK_DIR:PATH=@ITK_DIR@
KWWidgets_DIR:PATH=@KWWidgets_DIR@
")
......
......@@ -77,23 +77,10 @@ MACRO(SlicerMacroBuildModuleLogic)
SET(dynamicHeaders
"${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
# --------------------------------------------------------------------------
# TCL Wrapping
SET(MODULELOGIC_TCL_SRCS "")
IF (VTK_WRAP_TCL)
INCLUDE("${VTK_CMAKE_DIR}/vtkWrapTcl.cmake")
vtk_wrap_tcl3(${lib_name}
MODULELOGIC_TCL_SRCS
"${MODULELOGIC_SRCS}" "")
ENDIF(VTK_WRAP_TCL)
#-----------------------------------------------------------------------------
# Source group(s)
SOURCE_GROUP("Generated" FILES
${MODULELOGIC_TCL_SRCS}
${dynamicHeaders}
)
......@@ -102,7 +89,6 @@ MACRO(SlicerMacroBuildModuleLogic)
ADD_LIBRARY(${lib_name}
${MODULELOGIC_SRCS}
${MODULELOGIC_TCL_SRCS}
)
# Set loadable modules output path
......
......@@ -166,16 +166,6 @@ MARK_AS_ADVANCED(Slicer_ITK_GIT_TAG)
# Slicer implicitly uses Qt
SET(Slicer_USE_QT ON CACHE INTERNAL "Build Slicer with Qt")
# The following options are deprecated and will be removed
# when the port is complete
OPTION(Slicer_USE_KWWIDGETS "Deprecated - Build Slicer with KWWidgets" OFF)
MARK_AS_ADVANCED(Slicer_USE_KWWIDGETS)
if(Slicer_USE_KWWIDGETS)
OPTION(Slicer_USE_PYTHON "Deprecated - Integrate a python interpreter into Slicer." OFF)
OPTION(Slicer_BUILD_MODULES "Deprecated - Build Slicer Modules" ON)
MARK_AS_ADVANCED(Slicer_USE_PYTHON Slicer_BUILD_MODULES)
endif()
#-----------------------------------------------------------------------------
# CTestCustom
#-----------------------------------------------------------------------------
......@@ -402,21 +392,16 @@ ENDIF()
#-----------------------------------------------------------------------------
# Since modules are KWWidgets based, unset there variables
IF(NOT Slicer_USE_KWWIDGETS)
# Since the module Logic is shared between QTModules and regular Modules,
# the associated BIN, LIB and INCLUDE directory shouldn't be unset
#UNSET(Slicer_INSTALL_MODULES_BIN_DIR)
#UNSET(Slicer_INSTALL_MODULES_LIB_DIR)
#UNSET(Slicer_INSTALL_MODULES_INCLUDE_DIR)
UNSET(Slicer_INSTALL_MODULES_SHARE_DIR)
ENDIF()
# Since the module Logic is shared between QTModules and regular Modules,
# the associated BIN, LIB and INCLUDE directory shouldn't be unset
#UNSET(Slicer_INSTALL_MODULES_BIN_DIR)
#UNSET(Slicer_INSTALL_MODULES_LIB_DIR)
#UNSET(Slicer_INSTALL_MODULES_INCLUDE_DIR)
UNSET(Slicer_INSTALL_MODULES_SHARE_DIR)
# Relax some constraints related to the build settings file. This was
# preventing people from using the same compiler but with a different generator,
# or just the same compiler installed in a non-standard location.
IF(Slicer_USE_KWWIDGETS)
SET(SKIP_KWWidgets_BUILD_SETTINGS_FILE 1)
ENDIF()
SET(SKIP_VTK_BUILD_SETTINGS_FILE 1)
SET(SKIP_ITK_BUILD_SETTINGS_FILE 1)
SET(SKIP_Teem_BUILD_SETTINGS_FILE 1)
......@@ -425,7 +410,7 @@ SET(SKIP_Teem_BUILD_SETTINGS_FILE 1)
# Python
#-----------------------------------------------------------------------------
IF(Slicer_USE_PYTHON OR Slicer_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
FIND_PACKAGE(PythonLibs REQUIRED)
FIND_PACKAGE(PythonInterp REQUIRED)
ENDIF()
......@@ -436,24 +421,14 @@ ENDIF()
FIND_PACKAGE(ITK REQUIRED)
INCLUDE(${ITK_USE_FILE})
IF(Slicer_USE_KWWIDGETS)
#-----------------------------------------------------------------------------
# Deprecated - KWWidgets
#-----------------------------------------------------------------------------
FIND_PACKAGE(KWWidgets REQUIRED)
INCLUDE(${KWWidgets_USE_FILE})
ELSE()
#-----------------------------------------------------------------------------
# VTK
#-----------------------------------------------------------------------------
FIND_PACKAGE(VTK REQUIRED)
IF(NOT VTK_USE_QVTK)
MESSAGE(FATAL_ERROR "error: VTK was not configured to use QT, you probably need to recompile it with VTK_USE_GUISUPPORT ON, VTK_USE_QVTK ON, DESIRED_QT_VERSION 4 and QT_QMAKE_EXECUTABLE set appropriatly. Note that Qt >= ${minimum_required_qt_version} is *required*")
ENDIF()
INCLUDE(${VTK_USE_FILE})
FIND_PACKAGE(VTK REQUIRED)
IF(NOT VTK_USE_QVTK)
MESSAGE(FATAL_ERROR "error: VTK was not configured to use QT, you probably need to recompile it with VTK_USE_GUISUPPORT ON, VTK_USE_QVTK ON, DESIRED_QT_VERSION 4 and QT_QMAKE_EXECUTABLE set appropriatly. Note that Qt >= ${minimum_required_qt_version} is *required*")
ENDIF()
INCLUDE(${VTK_USE_FILE})
#-----------------------------------------------------------------------------
# Qt
......@@ -577,89 +552,15 @@ ENDIF()
#-----------------------------------------------------------------------------
# Need some Tcl/Tk info
#-----------------------------------------------------------------------------
IF(VTK_WRAP_TCL)
INCLUDE("${VTK_CMAKE_DIR}/vtkTclTkMacros.cmake")
VTK_GET_TCL_TK_VERSION(TCL_TK_MAJOR_VERSION TCL_TK_MINOR_VERSION)
SET(TCL_TK_VERSION_DOT "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
SET(TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}${TCL_TK_MINOR_VERSION}")
IF(Slicer_USE_KWWIDGETS)
INCLUDE("${KWWidgets_CMAKE_DIR}/KWWidgetsTclTkMacros.cmake")
incr_tcl_get_version(INCR_TCL_MAJOR_VERSION INCR_TCL_MINOR_VERSION)
SET(INCR_TCL_VERSION_DOT "${INCR_TCL_MAJOR_VERSION}.${INCR_TCL_MINOR_VERSION}")
SET(INCR_TCL_VERSION "${INCR_TCL_MAJOR_VERSION}${INCR_TCL_MINOR_VERSION}")
ENDIF()
ELSE()
# TODO: these should be passed in by SuperBuild
# For now, use 3.2 as a fallback - we haven't changed versions in years and probably
# never will, so this is always likely to work.
# This is needed so the launcher can set the paths to the correct subdirectories
# for incrTcl and incrTk
SET(TCL_TK_VERSION_DOT "8.4")
SET(TCL_TK_VERSION "84")
SET(INCR_TCL_VERSION_DOT "3.2")
SET(INCR_TCL_VERSION "32")
ENDIF()
#-----------------------------------------------------------------------------
# DEPRECATED - Remove the following section when port to Qt is completed
#-----------------------------------------------------------------------------
# Generate the default setup paths scripts.
# Generate some useful scripts that can be used to setup various environment
# variables and launch the executable properly against external packages.
#-----------------------------------------------------------------------------
IF(Slicer_USE_KWWIDGETS)
INCLUDE("${KWWidgets_CMAKE_DIR}/KWWidgetsPathsMacros.cmake")
SET(extra_dirs
"${Teem_DIR}/bin"
"${BatchMake_DIR}/bin"
"${OpenIGTLink_DIR}/bin"
"${Slicer_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}"
"${Slicer_HOME}/${Slicer_INSTALL_PLUGINS_LIB_DIR}"
"${Slicer_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}"
"${Slicer_HOME}/${Slicer_INSTALL_MODULES_LIB_DIR}"
)
kwwidgets_generate_setup_paths_scripts(
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" "Slicer3SetupPaths"
"${extra_dirs}"
)
ENDIF()
#-----------------------------------------------------------------------------
# DEPRECATED - Remove the following section when port to Qt is completed
#-----------------------------------------------------------------------------
# VTK 5.0 does not have VTK_CMAKE_DIR
# Alternatively you could use KWWidget's wrapping, which encapsulate
# the differences between various VTK versions:
# INCLUDE("${KWWidgets_CMAKE_DIR}/KWWidgetsWrappingMacros.cmake")
# KWWidgets_WRAP_TCL(${LIB_NAME} LIB_TCL_SRCS "${LIB_SRCS}" "")
#-----------------------------------------------------------------------------
IF(Slicer_USE_KWWIDGETS)
IF(NOT VTK_CMAKE_DIR)
SET(VTK_CMAKE_DIR "${VTK_SOURCE_DIR}/CMake")
ENDIF()
INCLUDE("${VTK_CMAKE_DIR}/vtkWrapTcl.cmake")
ENDIF()
#-----------------------------------------------------------------------------
# DEPRECATED - Remove the following section when port to Qt is completed
#-----------------------------------------------------------------------------
# Check versions of VTK to track CVS HEAD
#-----------------------------------------------------------------------------
IF(Slicer_USE_KWWIDGETS)
FIND_PACKAGE(VTK REQUIRED)
IF(EXISTS ${VTK_CMAKE_DIR}/VTKVersionMacros.cmake)
INCLUDE(${VTK_CMAKE_DIR}/VTKVersionMacros.cmake)
else()
#MESSAGE("Using local version of VTKVersionMacros for compatibility.")
INCLUDE(${Slicer_SOURCE_DIR}/Scripts/VTKVersionMacros.cmake)
ENDIF()
vtk_get_source_revision_and_date(VTKsource_revision VTKsource_date)
IF(VTKsource_revision LESS 1.2196)
message(FATAL_ERROR "Sorry, your VTK library was last updated on ${VTKsource_date}. Its source revision, according to vtkKWWidgetsVersion.h, is ${VTKsource_revision}. Please update to a newer revision.")
ENDIF()
ENDIF()
# TODO: these should be passed in by SuperBuild
# For now, use 3.2 as a fallback - we haven't changed versions in years and probably
# never will, so this is always likely to work.
# This is needed so the launcher can set the paths to the correct subdirectories
# for incrTcl and incrTk
SET(TCL_TK_VERSION_DOT "8.4")
SET(TCL_TK_VERSION "84")
SET(INCR_TCL_VERSION_DOT "3.2")
SET(INCR_TCL_VERSION "32")
#-----------------------------------------------------------------------------
# Set Slicer buildin libraries *_DIR variables
......@@ -794,44 +695,22 @@ slicer3_get_persistent_property(Slicer_Base_INCLUDE_DIRS Slicer_Base_INCLUDE_DIR
INCLUDE("${Slicer_CMAKE_DIR}/SlicerMacroBuildModuleLogic.cmake")
IF(NOT Slicer_USE_KWWIDGETS)
# KWWidgets and Qt modules share the same logics typically located in the
# kwwdigets modules. When KWWidgets is not build, the logic are missing for Qt
# we need to manually add them:
# Loop through Modules subdirectory and try to include Logic subdirectory if it exists
FILE(GLOB modules_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Modules/*)
FOREACH(subdir ${modules_subdirs})
IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/Logic)
ADD_SUBDIRECTORY(${subdir}/Logic)
# KWWidgets and Qt modules share the same logics typically located in the
# kwwdigets modules. When KWWidgets is not build, the logic are missing for Qt
# we need to manually add them:
# Loop through Modules subdirectory and try to include Logic subdirectory if it exists
FILE(GLOB modules_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Modules/*)
FOREACH(subdir ${modules_subdirs})
IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/Logic)
ADD_SUBDIRECTORY(${subdir}/Logic)
ENDIF()
FILE(GLOB subsubdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${subdir}/*)
FOREACH(subsubdir ${subsubdirs})
IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${subsubdir}/Logic)
ADD_SUBDIRECTORY(${subsubdir}/Logic)
ENDIF()
FILE(GLOB subsubdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${subdir}/*)
FOREACH(subsubdir ${subsubdirs})
IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${subsubdir}/Logic)
ADD_SUBDIRECTORY(${subsubdir}/Logic)
ENDIF()
ENDFOREACH()
ENDFOREACH()
ENDIF()
#-----------------------------------------------------------------------------
# DEPRECATED - Remove the following section when port to Qt is completed
#-----------------------------------------------------------------------------
# Modules and CLI
#-----------------------------------------------------------------------------
IF(Slicer_USE_KWWIDGETS)
INCLUDE("${Slicer_CMAKE_DIR}/Slicer3ModulesMacros.cmake")
IF(Slicer_BUILD_MODULES)
ADD_SUBDIRECTORY(Modules)
else(Slicer_BUILD_MODULES)
# if Slicer_BUILD_CLI is ON, we still need at least the CommandLineModule
# so that we can have CLI, without all the other modules
IF(Slicer_BUILD_CLI)
ADD_SUBDIRECTORY(Modules/CommandLineModule)
ENDIF(Slicer_BUILD_CLI)
ENDIF(Slicer_BUILD_MODULES)
ENDIF()
ENDFOREACH()
#-----------------------------------------------------------------------------
# Module EMSegment libraries
......@@ -839,7 +718,7 @@ ENDIF()
# The EMSegment{Registration,Graph,Algorithm,MRML} libraries are built from the top-level
# CMakeLists.txt. Doing so allow to build these libraries also if Slicer_USE_KWWIDGETS is OFF
IF(Slicer_BUILD_MODULES OR Slicer_BUILD_QTLOADABLEMODULES)
IF(Slicer_BUILD_QTLOADABLEMODULES)
INCLUDE("${Slicer_CMAKE_DIR}/Slicer3ModulesMacros.cmake")
ADD_SUBDIRECTORY(Modules/EMSegment/Algorithm)
ADD_SUBDIRECTORY(Modules/EMSegment/MRML)
......@@ -847,15 +726,6 @@ IF(Slicer_BUILD_MODULES OR Slicer_BUILD_QTLOADABLEMODULES)
ADD_SUBDIRECTORY(Modules/EMSegment/Graph)
ENDIF()
# Since EMSegment module expects Volume module and its associated library to be
# built beforehand,let's enfore that by building EMSegment here.
# Note that EMSegment has been commented in Modules/CMakeLists.txt
IF(Slicer_USE_KWWIDGETS)
IF(Slicer_BUILD_MODULES)
ADD_SUBDIRECTORY(Modules/EMSegment)
ENDIF()
ENDIF()
#-----------------------------------------------------------------------------
# Qt Loadable Modules
#-----------------------------------------------------------------------------
......
......@@ -32,9 +32,6 @@ SET(Slicer_Base_LIBRARY_DIRS_CONFIG ${Slicer_BINARY_DIR}/bin)
SET(ITK_DIR_CONFIG ${ITK_DIR})
SET(VTK_DIR_CONFIG ${VTK_DIR})
IF (Slicer_USE_KWWIDGETS)
SET(KWWidgets_DIR_CONFIG ${KWWidgets_DIR})
ENDIF (Slicer_USE_KWWIDGETS)
SET(Teem_DIR_CONFIG ${Teem_DIR})
SET(PYTHON_INCLUDE_PATH_CONFIG ${PYTHON_INCLUDE_PATH})
SET(PYTHON_LIBRARIES_CONFIG ${PYTHON_LIBRARIES})
......
......@@ -9,10 +9,6 @@ SET(dirs
# FileWatcher
)
IF(Slicer_USE_KWWIDGETS)
LIST(APPEND dirs LoadableModule)
ENDIF()
IF(Teem_FOUND)
LIST(APPEND dirs vtkTeem)
ENDIF()
......@@ -68,8 +64,8 @@ ENDIF()
# Set library properties
#-----------------------------------------------------------------------------
SET(ModuleDescriptionParser_USE_PYTHON ${Slicer_USE_PYTHON})
SET(LoadableModule_USE_PYTHON ${Slicer_USE_PYTHON})
SET(ModuleDescriptionParser_USE_PYTHON ${Slicer_USE_PYTHONQT})
SET(LoadableModule_USE_PYTHON ${Slicer_USE_PYTHONQT})
SET(IGT_USE_IGSTK ${Slicer_USE_IGSTK})
SET(IGT_USE_NAVITRACK ${Slicer_USE_NAVITRACK})
......@@ -97,10 +93,7 @@ ENDFOREACH()
# let's tweak the list of generated library names
STRING(REPLACE ITKCommandIO CommandIO libs "${libs}")
IF(Slicer_USE_KWWIDGETS)
STRING(REPLACE SlicerIO slicerio libs "${libs}")
LIST(REMOVE_ITEM libs GenerateLM slicerio) # Those are not libs
ENDIF()
STRING(REPLACE MGHImageIO MGHIO libs "${libs}")
STRING(REPLACE MRMLIDImageIO MRMLIDIO libs "${libs}")
LIST(REMOVE_ITEM libs SlicerExecutionModel) # Not a library
......
......@@ -37,11 +37,6 @@ SET(qt_module_resources
# Additional Target libraries
SET(qt_module_target_libraries
#${KWWidgets_LIBRARIES}
#${ITK_LIBRARIES}
#CommandLineModule
#SlicerTractographyDisplay
#SlicerTractographyFiducialSeeding
)
......
......@@ -9,7 +9,6 @@ valgrind \
--gen-suppressions=all \
--suppressions=../Slicer3/CMake/Slicer3ValgrindSuppressions.supp \
--suppressions=../Slicer3-lib/VTK/CMake/VTKValgrindSuppressions.supp \
--suppressions=../Slicer3-lib/KWWidgets/CMake/KWWidgetsValgrindSuppressions.supp \
--suppressions=../Slicer3-lib/Insight/CMake/InsightValgrind.supp \
--suppressions=../Slicer3-lib/Insight/Utilities/gdcm/CMake/gdcmValgrind.supp \
--suppressions=../Slicer3-lib/Insight/Utilities/vxl/config/valgrind.supp \
......
......@@ -9,7 +9,6 @@ valgrind \
--gen-suppressions=all \
--suppressions=@PROJECT_SOURCE_DIR@/CMake/Slicer3ValgrindSuppressions.supp \
--suppressions=@PROJECT_BINARY_DIR@/../Slicer3-lib/VTK/CMake/VTKValgrindSuppressions.supp \
--suppressions=@PROJECT_BINARY_DIR@/../Slicer3-lib/KWWidgets/CMake/KWWidgetsValgrindSuppressions.supp \
--suppressions=@PROJECT_BINARY_DIR@/../Slicer3-lib/Insight/CMake/InsightValgrind.supp \
--suppressions=@PROJECT_BINARY_DIR@/../Slicer3-lib/Insight/Utilities/gdcm/CMake/gdcmValgrind.supp \
--suppressions=@PROJECT_BINARY_DIR@/../Slicer3-lib/Insight/Utilities/vxl/config/valgrind.supp \
......
......@@ -18,7 +18,6 @@ set(Slicer_VERSION_MINOR "@Slicer_VERSION_MINOR@")
set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer was built with modules and CLI support.
set(Slicer_BUILD_MODULES "@Slicer_BUILD_MODULES@")
set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@")
IF(Slicer_USE_QT)
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
......@@ -35,7 +34,8 @@ SET(Slicer_LOGOS_RESOURCE "@Slicer_LOGOS_RESOURCE@")
set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer_USE_MIDAS "@Slicer_USE_MIDAS@")
set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
set(Slicer_USE_PYTHON "@Slicer_USE_PYTHON@")
set(Slicer_USE_PYTHONQT "@Slicer_USE_PYTHONQT@")
set(Slicer_USE_PYTHONQT_WITH_TCL "@Slicer_USE_PYTHONQT_WITH_TCL@")
set(Slicer_USE_OPENCV "@Slicer_USE_OPENCV@")
# Slicer home (top of the tree)
......@@ -108,7 +108,6 @@ set(ModuleDescriptionParser_DIR "@ModuleDescriptionParser_DIR_CONFIG@")
set(GenerateCLP_DIR "@GenerateCLP_DIR_CONFIG@")
set(GenerateLM_DIR "@GenerateLM_DIR@")
set(ITK_DIR "@ITK_DIR_CONFIG@")
set(KWWidgets_DIR "@KWWidgets_DIR_CONFIG@")
set(LoadableModule_DIR "@LoadableModule_DIR_CONFIG@")
set(Teem_DIR "@Teem_DIR_CONFIG@")
set(VTK_DIR "@VTK_DIR_CONFIG@")
......
......@@ -18,7 +18,6 @@ set(Slicer_VERSION_MINOR "@Slicer_VERSION_MINOR@")
set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer was built with modules and CLI support.
set(Slicer_BUILD_MODULES "@Slicer_BUILD_MODULES@")
set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@")
IF(Slicer_USE_QT)
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
......@@ -33,7 +32,8 @@ set(Slicer_USE_IGSTK "@Slicer_USE_IGSTK@")
set(Slicer_USE_MIDAS "@Slicer_USE_MIDAS@")
set(Slicer_USE_NAVITRACK "@Slicer_USE_NAVITRACK@")
set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
set(Slicer_USE_PYTHON "@Slicer_USE_PYTHON@")
set(Slicer_USE_PYTHONQT "@Slicer_USE_PYTHONQT@")
set(Slicer_USE_PYTHONQT_WITH_TCL "@Slicer_USE_PYTHONQT_WITH_TCL@")
set(Slicer_USE_OPENTRACKER "@Slicer_USE_OPENTRACKER@")
# Slicer could be installed anywhere, so set all paths based on where
......@@ -147,7 +147,6 @@ set(ModuleDescriptionParser_DIR "${Slicer_HOME}/lib/ModuleDescriptionParser")
set(GenerateCLP_DIR "${Slicer_HOME}/lib/GenerateCLP")
set(GenerateLM_DIR "${Slicer_HOME}/lib/GenerateLM")
set(ITK_DIR "${Slicer_HOME}/lib/InsightToolkit")
set(KWWidgets_DIR "${Slicer_HOME}/lib/KWWidgets")
set(LoadableModule_DIR "${Slicer_HOME}/lib/LoadableModule")
set(Teem_DIR "${Slicer_HOME}/lib/Teem-@Teem_VERSION_MAJOR@.@Teem_VERSION_MINOR@.@Teem_VERSION_PATCH@")
set(VTK_DIR "${Slicer_HOME}/lib/vtk-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@")
......
......@@ -78,7 +78,7 @@ set(incrTcl_DEPENDENCIES tcl tk)
set(iwidgets_DEPENDENCIES tcl itcl)
set(blt_DEPENDENCIES tcl tk)
set(python_DEPENDENCIES)
if(Slicer_USE_KWWIDGETS OR Slicer_USE_PYTHONQT_WITH_TCL)
if(Slicer_USE_PYTHONQT_WITH_TCL)
if(WIN32)
set(python_DEPENDENCIES tcl)
else()
......@@ -96,7 +96,6 @@ set(CTK_DEPENDENCIES VTK)
if(Slicer_USE_PYTHONQT)
list(APPEND CTK_DEPENDENCIES python)
endif()
set(KWWidgets_DEPENDENCIES VTK)
set(Insight_DEPENDENCIES)
if(Slicer_USE_BatchMake)
......@@ -114,17 +113,13 @@ set(slicer_DEPENDENCIES VTK Insight OpenIGTLink teem cmcurl libarchive)
# Conditionnaly include ExternalProject Target
#------------------------------------------------------------------------------
if(Slicer_USE_KWWIDGETS OR Slicer_USE_PYTHONQT_WITH_TCL)
if(Slicer_USE_PYTHONQT_WITH_TCL)
include(SuperBuild/External_Tcl.cmake)
include(SuperBuild/External_Tk.cmake)
include(SuperBuild/External_incrTcl.cmake)
endif()
if(Slicer_USE_KWWIDGETS)
include(SuperBuild/External_iwidgets.cmake)
include(SuperBuild/External_blt.cmake)
endif()
if(Slicer_USE_PYTHON OR Slicer_USE_PYTHONQT)
if(Slicer_USE_PYTHONQT)
include(SuperBuild/External_Python26.cmake)
if(Slicer_USE_NUMPY)
include(SuperBuild/External_CLAPACK.cmake)
......@@ -147,10 +142,6 @@ if(Slicer_USE_QT)
endif()
endif()
if(Slicer_USE_KWWIDGETS)
include(SuperBuild/External_KWWidgets.cmake)
endif()
include(SuperBuild/External_Insight.cmake)
include(SuperBuild/External_teem.cmake)
include(SuperBuild/External_OpenIGTLink.cmake)
......@@ -166,15 +157,6 @@ include(SuperBuild/External_libarchive.cmake)
# Update external project dependencies
#------------------------------------------------------------------------------
# For now, tk and itcl are used only when Slicer_USE_KWWIDGETS is ON
if(Slicer_USE_KWWIDGETS)
if(WIN32)
list(APPEND slicer_DEPENDENCIES tcl KWWidgets)
else()
list(APPEND slicer_DEPENDENCIES tcl tk blt iwidgets itcl KWWidgets)
endif()
endif()
if (Slicer_USE_PYTHONQT_WITH_TCL