Commit 890f7df2 authored by jcfr's avatar jcfr
Browse files

COMP: Remove occurences of Slicer_USE_QT variable

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16353 3bd1e089-480b-0410-8dfb-8563597acbee
parent 5bdef023
...@@ -4,9 +4,7 @@ IF(Slicer_BUILD_CLI) ...@@ -4,9 +4,7 @@ IF(Slicer_BUILD_CLI)
ADD_SUBDIRECTORY(CLI) ADD_SUBDIRECTORY(CLI)
ENDIF(Slicer_BUILD_CLI) ENDIF(Slicer_BUILD_CLI)
IF(Slicer_USE_QT) ADD_SUBDIRECTORY(SlicerQT)
ADD_SUBDIRECTORY(SlicerQT)
ENDIF(Slicer_USE_QT)
IF(BUILD_TESTING) IF(BUILD_TESTING)
ADD_SUBDIRECTORY(Testing) ADD_SUBDIRECTORY(Testing)
......
...@@ -41,14 +41,10 @@ INCLUDE_DIRECTORIES( ...@@ -41,14 +41,10 @@ INCLUDE_DIRECTORIES(
) )
ADD_SUBDIRECTORY(Logic) ADD_SUBDIRECTORY(Logic)
ADD_SUBDIRECTORY(QTCore)
IF(Slicer_USE_QT) ADD_SUBDIRECTORY(QTGUI)
ADD_SUBDIRECTORY(QTCore) ADD_SUBDIRECTORY(QTCLI)
ADD_SUBDIRECTORY(QTGUI) ADD_SUBDIRECTORY(QTCoreModules)
ADD_SUBDIRECTORY(QTCLI)
ADD_SUBDIRECTORY(QTCoreModules)
ENDIF(Slicer_USE_QT)
ADD_SUBDIRECTORY(GUI) ADD_SUBDIRECTORY(GUI)
ADD_SUBDIRECTORY(CLI) ADD_SUBDIRECTORY(CLI)
......
...@@ -386,9 +386,7 @@ void vtkSlicerApplicationLogic::ProcessMRMLEvents(vtkObject * /*caller*/, ...@@ -386,9 +386,7 @@ void vtkSlicerApplicationLogic::ProcessMRMLEvents(vtkObject * /*caller*/,
unsigned long /*event*/, unsigned long /*event*/,
void * /*callData*/ ) void * /*callData*/ )
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::ProcessMRMLEvents is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::ProcessMRMLEvents is deprecated");
#endif
// //
// Look for a selection node in the scene // Look for a selection node in the scene
...@@ -511,9 +509,7 @@ void vtkSlicerApplicationLogic::PrintSelf(ostream& os, vtkIndent indent) ...@@ -511,9 +509,7 @@ void vtkSlicerApplicationLogic::PrintSelf(ostream& os, vtkIndent indent)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkSlicerApplicationLogic::Connect (const char *URL) void vtkSlicerApplicationLogic::Connect (const char *URL)
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Connect is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Connect is deprecated");
#endif
if (this->GetMRMLScene()) if (this->GetMRMLScene())
{ {
...@@ -525,9 +521,7 @@ void vtkSlicerApplicationLogic::Connect (const char *URL) ...@@ -525,9 +521,7 @@ void vtkSlicerApplicationLogic::Connect (const char *URL)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int vtkSlicerApplicationLogic::Commit() int vtkSlicerApplicationLogic::Commit()
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Commit is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Commit is deprecated");
#endif
if (this->GetMRMLScene()) if (this->GetMRMLScene())
{ {
return (this->GetMRMLScene()->Commit()); return (this->GetMRMLScene()->Commit());
...@@ -538,9 +532,7 @@ int vtkSlicerApplicationLogic::Commit() ...@@ -538,9 +532,7 @@ int vtkSlicerApplicationLogic::Commit()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int vtkSlicerApplicationLogic::Commit(const char *URL) int vtkSlicerApplicationLogic::Commit(const char *URL)
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Commit is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::Commit is deprecated");
#endif
if (this->GetMRMLScene()) if (this->GetMRMLScene())
{ {
return (this->GetMRMLScene()->Commit(URL)); return (this->GetMRMLScene()->Commit(URL));
...@@ -565,9 +557,7 @@ vtkCxxSetObjectMacro(vtkSlicerApplicationLogic, SelectionNode, vtkMRMLSelectionN ...@@ -565,9 +557,7 @@ vtkCxxSetObjectMacro(vtkSlicerApplicationLogic, SelectionNode, vtkMRMLSelectionN
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkMRMLSelectionNode* vtkSlicerApplicationLogic::GetSelectionNode() vtkMRMLSelectionNode* vtkSlicerApplicationLogic::GetSelectionNode()
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetSelectionNode is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetSelectionNode is deprecated");
#endif
vtkDebugMacro(<< this->GetClassName() << " (" << this vtkDebugMacro(<< this->GetClassName() << " (" << this
<< "): returning SelectionNode address " << this->SelectionNode ); << "): returning SelectionNode address " << this->SelectionNode );
return this->SelectionNode; return this->SelectionNode;
...@@ -579,9 +569,7 @@ vtkCxxSetObjectMacro(vtkSlicerApplicationLogic, InteractionNode, vtkMRMLInteract ...@@ -579,9 +569,7 @@ vtkCxxSetObjectMacro(vtkSlicerApplicationLogic, InteractionNode, vtkMRMLInteract
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkMRMLInteractionNode* vtkSlicerApplicationLogic::GetInteractionNode() vtkMRMLInteractionNode* vtkSlicerApplicationLogic::GetInteractionNode()
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetInteractionNode is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetInteractionNode is deprecated");
#endif
vtkDebugMacro(<< this->GetClassName() << " (" << this vtkDebugMacro(<< this->GetClassName() << " (" << this
<< "): returning InteractionNode address " << this->InteractionNode ); << "): returning InteractionNode address " << this->InteractionNode );
return this->InteractionNode; return this->InteractionNode;
...@@ -590,9 +578,7 @@ vtkMRMLInteractionNode* vtkSlicerApplicationLogic::GetInteractionNode() ...@@ -590,9 +578,7 @@ vtkMRMLInteractionNode* vtkSlicerApplicationLogic::GetInteractionNode()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkMRMLSliceLogic* vtkSlicerApplicationLogic::GetSliceLogic(const char *layoutName) vtkMRMLSliceLogic* vtkSlicerApplicationLogic::GetSliceLogic(const char *layoutName)
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetSliceLogic is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::GetSliceLogic is deprecated");
#endif
if (this->InternalSliceLogicMap) if (this->InternalSliceLogicMap)
{ {
SliceLogicMap::const_iterator lend = (*this->InternalSliceLogicMap).end(); SliceLogicMap::const_iterator lend = (*this->InternalSliceLogicMap).end();
...@@ -611,9 +597,7 @@ vtkMRMLSliceLogic* vtkSlicerApplicationLogic::GetSliceLogic(const char *layoutNa ...@@ -611,9 +597,7 @@ vtkMRMLSliceLogic* vtkSlicerApplicationLogic::GetSliceLogic(const char *layoutNa
// this function can be further improved to check if this is a duplicate. // this function can be further improved to check if this is a duplicate.
void vtkSlicerApplicationLogic::AddSliceLogic(const char *layoutName, vtkMRMLSliceLogic *sliceLogic) void vtkSlicerApplicationLogic::AddSliceLogic(const char *layoutName, vtkMRMLSliceLogic *sliceLogic)
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::AddSliceLogic is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::AddSliceLogic is deprecated");
#endif
if (this->InternalSliceLogicMap) if (this->InternalSliceLogicMap)
{ {
(*this->InternalSliceLogicMap)[layoutName] = sliceLogic; (*this->InternalSliceLogicMap)[layoutName] = sliceLogic;
...@@ -622,9 +606,7 @@ void vtkSlicerApplicationLogic::AddSliceLogic(const char *layoutName, vtkMRMLSli ...@@ -622,9 +606,7 @@ void vtkSlicerApplicationLogic::AddSliceLogic(const char *layoutName, vtkMRMLSli
void vtkSlicerApplicationLogic::AddSliceLogic(vtkMRMLSliceLogic *sliceLogic) void vtkSlicerApplicationLogic::AddSliceLogic(vtkMRMLSliceLogic *sliceLogic)
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::AddSliceLogic is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::AddSliceLogic is deprecated");
#endif
if (this->InternalSliceLogicMap) if (this->InternalSliceLogicMap)
{ {
(*this->InternalSliceLogicMap)[sliceLogic->GetName()] = sliceLogic; (*this->InternalSliceLogicMap)[sliceLogic->GetName()] = sliceLogic;
...@@ -633,9 +615,7 @@ void vtkSlicerApplicationLogic::AddSliceLogic(vtkMRMLSliceLogic *sliceLogic) ...@@ -633,9 +615,7 @@ void vtkSlicerApplicationLogic::AddSliceLogic(vtkMRMLSliceLogic *sliceLogic)
void vtkSlicerApplicationLogic::RemoveSliceLogic(vtkMRMLSliceLogic *sliceLogic) void vtkSlicerApplicationLogic::RemoveSliceLogic(vtkMRMLSliceLogic *sliceLogic)
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::RemoveSliceLogic is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::RemoveSliceLogic is deprecated");
#endif
SliceLogicMap::iterator mit; SliceLogicMap::iterator mit;
for (mit = (*this->InternalSliceLogicMap).begin(); for (mit = (*this->InternalSliceLogicMap).begin();
mit != (*this->InternalSliceLogicMap).end(); ++mit) mit != (*this->InternalSliceLogicMap).end(); ++mit)
...@@ -652,9 +632,7 @@ void vtkSlicerApplicationLogic::RemoveSliceLogic(vtkMRMLSliceLogic *sliceLogic) ...@@ -652,9 +632,7 @@ void vtkSlicerApplicationLogic::RemoveSliceLogic(vtkMRMLSliceLogic *sliceLogic)
void vtkSlicerApplicationLogic::RemoveSliceLogic(char *layoutName) void vtkSlicerApplicationLogic::RemoveSliceLogic(char *layoutName)
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::RemoveSliceLogic is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::RemoveSliceLogic is deprecated");
#endif
SliceLogicMap::iterator mit; SliceLogicMap::iterator mit;
mit = (*this->InternalSliceLogicMap).find(layoutName); mit = (*this->InternalSliceLogicMap).find(layoutName);
if (mit != (*this->InternalSliceLogicMap).end()) if (mit != (*this->InternalSliceLogicMap).end())
...@@ -668,9 +646,7 @@ void vtkSlicerApplicationLogic::RemoveSliceLogic(char *layoutName) ...@@ -668,9 +646,7 @@ void vtkSlicerApplicationLogic::RemoveSliceLogic(char *layoutName)
void vtkSlicerApplicationLogic::CreateSliceLogics() void vtkSlicerApplicationLogic::CreateSliceLogics()
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::CreateSliceLogics is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::CreateSliceLogics is deprecated");
#endif
// make sure there is a CrossHair in the scene // make sure there is a CrossHair in the scene
vtkMRMLCrosshairNode *crosshair = vtkMRMLCrosshairNode::New(); vtkMRMLCrosshairNode *crosshair = vtkMRMLCrosshairNode::New();
crosshair->SetCrosshairName("default"); crosshair->SetCrosshairName("default");
...@@ -714,9 +690,7 @@ void vtkSlicerApplicationLogic::CreateSliceLogics() ...@@ -714,9 +690,7 @@ void vtkSlicerApplicationLogic::CreateSliceLogics()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkSlicerApplicationLogic::DeleteSliceLogics() void vtkSlicerApplicationLogic::DeleteSliceLogics()
{ {
#ifdef Slicer_USE_QT
vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::DeleteSliceLogics is deprecated"); vtkWarningMacro(<< "SlicerQt - vtkSlicerApplicationLogic::DeleteSliceLogics is deprecated");
#endif
if (this->InternalSliceLogicMap) if (this->InternalSliceLogicMap)
{ {
vtkMRMLSliceLogic *sliceLogic; vtkMRMLSliceLogic *sliceLogic;
......
...@@ -160,9 +160,6 @@ MARK_AS_ADVANCED(Slicer_ITK_GIT_REPOSITORY) ...@@ -160,9 +160,6 @@ MARK_AS_ADVANCED(Slicer_ITK_GIT_REPOSITORY)
SET(Slicer_ITK_GIT_TAG "origin/slicer-4.0" CACHE STRING "ITK git tag to use") SET(Slicer_ITK_GIT_TAG "origin/slicer-4.0" CACHE STRING "ITK git tag to use")
MARK_AS_ADVANCED(Slicer_ITK_GIT_TAG) MARK_AS_ADVANCED(Slicer_ITK_GIT_TAG)
# Slicer implicitly uses Qt
SET(Slicer_USE_QT ON CACHE INTERNAL "Build Slicer with Qt")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Documentation # Documentation
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
...@@ -417,52 +414,46 @@ INCLUDE(${VTK_USE_FILE}) ...@@ -417,52 +414,46 @@ INCLUDE(${VTK_USE_FILE})
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Qt # Qt
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
IF(Slicer_USE_QT)
# Module name should be specified as they appear in FindQt4.cmake # Module name should be specified as they appear in FindQt4.cmake
# For example, the module name associated with the variable QT_USE_QTXML is XML. # For example, the module name associated with the variable QT_USE_QTXML is XML.
SET(Slicer_REQUIRED_QT_MODULES CORE GUI NETWORK) SET(Slicer_REQUIRED_QT_MODULES CORE GUI NETWORK)
IF(BUILD_TESTING) IF(BUILD_TESTING)
LIST(APPEND Slicer_REQUIRED_QT_MODULES TEST) LIST(APPEND Slicer_REQUIRED_QT_MODULES TEST)
ENDIF()
INCLUDE(SlicerFindQtAndCheckVersion)
ENDIF() ENDIF()
INCLUDE(SlicerFindQtAndCheckVersion)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# CTK # CTK
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
IF(Slicer_USE_QT) FIND_PACKAGE(CTK REQUIRED)
FIND_PACKAGE(CTK REQUIRED) INCLUDE(${CTK_USE_FILE})
INCLUDE(${CTK_USE_FILE}) # Update CMake module path
# Update CMake module path SET(CMAKE_MODULE_PATH
SET(CMAKE_MODULE_PATH ${VTK_CMAKE_DIR}
${VTK_CMAKE_DIR} ${CTK_CMAKE_DIR}
${CTK_CMAKE_DIR} ${CMAKE_MODULE_PATH}
${CMAKE_MODULE_PATH} ${CTK_CMAKE_UTILITIES_DIR})
${CTK_CMAKE_UTILITIES_DIR})
ENDIF()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# PythonQt # PythonQt
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
IF(Slicer_USE_QT) IF(Slicer_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT) IF(NOT VTK_WRAP_PYTHON)
IF(NOT VTK_WRAP_PYTHON) MESSAGE(FATAL_ERROR "Since Slicer_USE_PYTHONQT is ON, VTK_WRAP_PYTHON is expected to be ON. Re-configure VTK with python wrapping.")
MESSAGE(FATAL_ERROR "Since both Slicer_USE_QT and Slicer_USE_PYTHONQT are ON, VTK_WRAP_PYTHON is expected to be ON. Disable Slicer_USE_PYTHONQT or re-configure VTK with python wrapping.") ENDIF()
ENDIF()
INCLUDE(vtkMacroKitPythonWrap) INCLUDE(vtkMacroKitPythonWrap)
SET(PYTHONQT_INSTALL_DIR ${CTK_PYTHONQT_INSTALL_DIR}) SET(PYTHONQT_INSTALL_DIR ${CTK_PYTHONQT_INSTALL_DIR})
LINK_DIRECTORIES(${PYTHONQT_INSTALL_DIR}/lib) LINK_DIRECTORIES(${PYTHONQT_INSTALL_DIR}/lib)
INCLUDE(ctkMacroWrapPythonQt) INCLUDE(ctkMacroWrapPythonQt)
INCLUDE(ctkMacroCompilePythonScript) INCLUDE(ctkMacroCompilePythonScript)
# Enable qMRMLWidgets python wrapping # Enable qMRMLWidgets python wrapping
SET(qMRMLWidgets_WRAP_PYTHON ON) SET(qMRMLWidgets_WRAP_PYTHON ON)
ENDIF()
ENDIF() ENDIF()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
...@@ -549,19 +540,17 @@ SET(vtkITK_DIR ${Slicer_BINARY_DIR}/Libs/vtkITK) ...@@ -549,19 +540,17 @@ SET(vtkITK_DIR ${Slicer_BINARY_DIR}/Libs/vtkITK)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Qt Loadable and Scripted Modules # Qt Loadable and Scripted Modules
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
IF(Slicer_USE_QT) IF(Slicer_BUILD_QTLOADABLEMODULES)
IF(Slicer_BUILD_QTLOADABLEMODULES) SET(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "${Slicer_INSTALL_LIB_DIR}/QTLoadableModules")
SET(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "${Slicer_INSTALL_LIB_DIR}/QTLoadableModules") SET(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "${Slicer_INSTALL_LIB_DIR}/QTLoadableModules")
SET(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "${Slicer_INSTALL_LIB_DIR}/QTLoadableModules") SET(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/QTLoadableModules")
SET(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/QTLoadableModules") SET(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "${Slicer_INSTALL_SHARE_DIR}/QTLoadableModules")
SET(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "${Slicer_INSTALL_SHARE_DIR}/QTLoadableModules") ENDIF()
ENDIF() IF(Slicer_BUILD_QTSCRIPTEDMODULES)
IF(Slicer_BUILD_QTSCRIPTEDMODULES) SET(Slicer_INSTALL_QTSCRIPTEDMODULES_BIN_DIR "${Slicer_INSTALL_LIB_DIR}/QTScriptedModules")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_BIN_DIR "${Slicer_INSTALL_LIB_DIR}/QTScriptedModules") SET(Slicer_INSTALL_QTSCRIPTEDMODULES_LIB_DIR "${Slicer_INSTALL_LIB_DIR}/QTScriptedModules")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_LIB_DIR "${Slicer_INSTALL_LIB_DIR}/QTScriptedModules") SET(Slicer_INSTALL_QTSCRIPTEDMODULES_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/QTScriptedModules")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/QTScriptedModules") SET(Slicer_INSTALL_QTSCRIPTEDMODULES_SHARE_DIR "${Slicer_INSTALL_SHARE_DIR}/QTScriptedModules")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_SHARE_DIR "${Slicer_INSTALL_SHARE_DIR}/QTScriptedModules")
ENDIF()
ENDIF() ENDIF()
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
...@@ -677,11 +666,11 @@ ENDFOREACH() ...@@ -677,11 +666,11 @@ ENDFOREACH()
# Qt Loadable Modules # Qt Loadable Modules
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
IF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES) IF(Slicer_BUILD_QTLOADABLEMODULES)
ADD_SUBDIRECTORY(QTModules) ADD_SUBDIRECTORY(QTModules)
ENDIF() ENDIF()
IF(Slicer_USE_PYTHONQT AND Slicer_BUILD_QTSCRIPTEDMODULES) IF(Slicer_BUILD_QTSCRIPTEDMODULES)
ADD_SUBDIRECTORY(QTScriptedModules) ADD_SUBDIRECTORY(QTScriptedModules)
ENDIF() ENDIF()
...@@ -715,21 +704,17 @@ INSTALL(DIRECTORY ...@@ -715,21 +704,17 @@ INSTALL(DIRECTORY
# let's build the launcher for Kww, KwwAndQt and also QtOnly slicer ... # let's build the launcher for Kww, KwwAndQt and also QtOnly slicer ...
ADD_SUBDIRECTORY(Utilities/Launcher) ADD_SUBDIRECTORY(Utilities/Launcher)
IF(Slicer_USE_QT) # on Mac we need to include the path of each Qt Framework in DYLD_LIBRARY_PATH in the launcher.
IF(APPLE)
# on Mac we need to include the path of each Qt Framework in DYLD_LIBRARY_PATH in the launcher. SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL QTOPENGL QTWEBKIT PHONON QTXMLPATTERNS)
IF(APPLE)
SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL QTOPENGL QTWEBKIT PHONON QTXMLPATTERNS)
FOREACH(qtlib ${QTLIBLIST})
IF(QT_${qtlib}_LIBRARY_RELEASE AND APPLE)
GET_FILENAME_COMPONENT(QT_FRAMEWORK_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
SET(Slicer_QT_FRAMEWORK_DIRS "lib/Qt/${QT_FRAMEWORK_NAME_tmp}/Versions/4:${Slicer_QT_FRAMEWORK_DIRS}")
ENDIF()
ENDFOREACH()
ENDIF()
ENDIF(Slicer_USE_QT) FOREACH(qtlib ${QTLIBLIST})
IF(QT_${qtlib}_LIBRARY_RELEASE AND APPLE)
GET_FILENAME_COMPONENT(QT_FRAMEWORK_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME)
SET(Slicer_QT_FRAMEWORK_DIRS "lib/Qt/${QT_FRAMEWORK_NAME_tmp}/Versions/4:${Slicer_QT_FRAMEWORK_DIRS}")
ENDIF()
ENDFOREACH()
ENDIF()
CONFIGURE_FILE( CONFIGURE_FILE(
${Slicer_SOURCE_DIR}/launch.tcl.in ${Slicer_SOURCE_DIR}/launch.tcl.in
...@@ -743,10 +728,7 @@ INSTALL( ...@@ -743,10 +728,7 @@ INSTALL(
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Launcher for QTDesigner # Launcher for QTDesigner
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
ADD_SUBDIRECTORY(Utilities/Designer)
IF(Slicer_USE_QT)
ADD_SUBDIRECTORY(Utilities/Designer)
ENDIF()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Package slicer # Package slicer
......
...@@ -20,23 +20,14 @@ LIST(APPEND dirs ...@@ -20,23 +20,14 @@ LIST(APPEND dirs
MRMLCLI MRMLCLI
MRMLLogic MRMLLogic
MRMLDisplayableManager MRMLDisplayableManager
)
LIST(APPEND dirs
MRMLIDImageIO MRMLIDImageIO
MGHImageIO MGHImageIO
IGT IGT
RemoteIO RemoteIO
#SIGN #SIGN
qMRMLWidgets
) )
#-----------------------------------------------------------------------------
# QT libraries
#-----------------------------------------------------------------------------
IF(Slicer_USE_QT)
LIST(APPEND dirs qMRMLWidgets)
ENDIF()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# CUDA # CUDA
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
......
...@@ -19,9 +19,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@") ...@@ -19,9 +19,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer was built with modules and CLI support. # Whether Slicer was built with modules and CLI support.
set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@") set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@")
IF(Slicer_USE_QT) set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
ENDIF(Slicer_USE_QT)
# Whether Slicer was built with shared libraries. # Whether Slicer was built with shared libraries.
set(Slicer_BUILD_SHARED "@BUILD_SHARED_LIBS@") set(Slicer_BUILD_SHARED "@BUILD_SHARED_LIBS@")
...@@ -83,16 +81,14 @@ set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@") ...@@ -83,16 +81,14 @@ set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@")
set(Slicer_INSTALL_PLUGINS_SHARE_DIR "@Slicer_INSTALL_PLUGINS_SHARE_DIR@") set(Slicer_INSTALL_PLUGINS_SHARE_DIR "@Slicer_INSTALL_PLUGINS_SHARE_DIR@")
set(Slicer_INSTALL_PLUGINS_CACHE_DIR "@Slicer_INSTALL_PLUGINS_CACHE_DIR@") set(Slicer_INSTALL_PLUGINS_CACHE_DIR "@Slicer_INSTALL_PLUGINS_CACHE_DIR@")
set(Slicer_USE_QT "@Slicer_USE_QT@")
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@") set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
IF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES) IF(Slicer_BUILD_QTLOADABLEMODULES)
set(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR@")
set(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@")
set(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@")
set(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR@")
ENDIF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES) ENDIF()
# The Slicer install prefix (*not* defined in the install tree) # The Slicer install prefix (*not* defined in the install tree)
set(Slicer_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") set(Slicer_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
......
...@@ -19,9 +19,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@") ...@@ -19,9 +19,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer was built with modules and CLI support. # Whether Slicer was built with modules and CLI support.
set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@") set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@")
IF(Slicer_USE_QT) set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
ENDIF(Slicer_USE_QT)
# Whether Slicer was built with shared libraries. # Whether Slicer was built with shared libraries.
set(Slicer_BUILD_SHARED "@BUILD_SHARED_LIBS@") set(Slicer_BUILD_SHARED "@BUILD_SHARED_LIBS@")
...@@ -128,12 +126,12 @@ set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@") ...@@ -128,12 +126,12 @@ set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@")
set(Slicer_INSTALL_PLUGINS_SHARE_DIR "@Slicer_INSTALL_PLUGINS_SHARE_DIR@") set(Slicer_INSTALL_PLUGINS_SHARE_DIR "@Slicer_INSTALL_PLUGINS_SHARE_DIR@")
set(Slicer_INSTALL_PLUGINS_CACHE_DIR "@Slicer_INSTALL_PLUGINS_CACHE_DIR@") set(Slicer_INSTALL_PLUGINS_CACHE_DIR "@Slicer_INSTALL_PLUGINS_CACHE_DIR@")
IF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES) IF(Slicer_BUILD_QTLOADABLEMODULES)
set(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR@")
set(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@")
set(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@")
set(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR@") set(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR@")
ENDIF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES) ENDIF()
# Components needed to build modules from outside a Slicer build tree or # Components needed to build modules from outside a Slicer build tree or
# from outside a Slicer installation tree # from outside a Slicer installation tree
......
...@@ -135,21 +135,15 @@ endif() ...@@ -135,21 +135,15 @@ endif()
include(SuperBuild/External_VTK.cmake) include(SuperBuild/External_VTK.cmake)
include(SuperBuild/External_Insight.cmake) include(SuperBuild/External_Insight.cmake)
include(SuperBuild/External_CTK.cmake)
if(Slicer_USE_QT) if (Slicer_USE_CTKAPPLAUNCHER)
include(SuperBuild/External_CTK.cmake) include(SuperBuild/External_CTKAPPLAUNCHER.cmake)
if (Slicer_USE_CTKAPPLAUNCHER)
include(SuperBuild/External_CTKAPPLAUNCHER.cmake)
endif()
endif() endif()
include(SuperBuild/External_teem.cmake) include(SuperBuild/External_teem.cmake)
include(SuperBuild/External_OpenIGTLink.cmake) include(SuperBuild/External_OpenIGTLink.cmake)
if(Slicer_USE_BatchMake) if(Slicer_USE_BatchMake)
include(SuperBuild/External_BatchMake.cmake) include(SuperBuild/External_BatchMake.cmake)
endif() endif()
include(SuperBuild/External_cmcurl.cmake) include(SuperBuild/External_cmcurl.cmake)
include(SuperBuild/External_libarchive.cmake) include(SuperBuild/External_libarchive.cmake)
...@@ -163,11 +157,9 @@ if (Slicer_USE_PYTHONQT_WITH_TCL) ...@@ -163,11 +157,9 @@ if (Slicer_USE_PYTHONQT_WITH_TCL)
endif() endif()
endif() endif()
if(Slicer_USE_QT) list(APPEND slicer_DEPENDENCIES CTK)
list(APPEND slicer_DEPENDENCIES CTK) if (Slicer_USE_CTKAPPLAUNCHER)
if (Slicer_USE_CTKAPPLAUNCHER) list(APPEND slicer_DEPENDENCIES CTKAPPLAUNCHER)
list(APPEND slicer_DEPENDENCIES CTKAPPLAUNCHER)
endif()
endif() endif()
if(Slicer_USE_PYTHONQT) if(Slicer_USE_PYTHONQT)
...@@ -208,7 +200,6 @@ SET(slicer_cmake_boolean_args ...@@ -208,7 +200,6 @@ SET(slicer_cmake_boolean_args
WITH_MEMCHECK WITH_MEMCHECK