Commit dfb06e6a authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_USE_PYTHONQT into Slicer_USE_PYTHONQT

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15089 3bd1e089-480b-0410-8dfb-8563597acbee
parent 959b57aa
......@@ -810,7 +810,7 @@ int Slicer3_main(int& argc, char *argv[])
Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
#endif
slicerApp->SetModulePanel(new qSlicerModulePanel(0, qApplication->defaultWindowFlags()));
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
PythonQt::init(PythonQt::DoNotInitializePython);
PythonQt_QtAll::init();
#endif
......
......@@ -23,10 +23,10 @@
#include <QDesktopServices>
#include <QUrl>
#include "vtkSlicerConfigure.h" // For Slicer3_USE_PYTHONQT
#include "vtkSlicerConfigure.h" // For Slicer_USE_PYTHONQT
// CTK includes
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
#include <ctkPythonShell.h>
#endif
......@@ -42,7 +42,7 @@
#include "qSlicerMainWindowCore_p.h"
#include "qSlicerModuleManager.h"
#include "qSlicerModulePanel.h"
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
#include "qSlicerPythonManager.h"
#endif
......@@ -55,7 +55,7 @@
//---------------------------------------------------------------------------
qSlicerMainWindowCorePrivate::qSlicerMainWindowCorePrivate()
{
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
this->PythonShell = 0;
#endif
}
......@@ -63,7 +63,7 @@ qSlicerMainWindowCorePrivate::qSlicerMainWindowCorePrivate()
//---------------------------------------------------------------------------
qSlicerMainWindowCorePrivate::~qSlicerMainWindowCorePrivate()
{
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
if (this->PythonShell)
{
delete this->PythonShell;
......@@ -169,7 +169,7 @@ qSlicerMainWindowCore_onViewLayout_implementation(SideBySideLightbox);
//-----------------------------------------------------------------------------
void qSlicerMainWindowCore::onWindowPythonInteractorActionTriggered()
{
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
Q_D(qSlicerMainWindowCore);
if (!d->PythonShell)
{
......
......@@ -28,6 +28,6 @@ ENDIF(Slicer_USE_QT)
ADD_SUBDIRECTORY(GUI)
ADD_SUBDIRECTORY(CLI)
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
ADD_SUBDIRECTORY(Python)
ENDIF(Slicer3_USE_PYTHONQT)
ENDIF(Slicer_USE_PYTHONQT)
......@@ -4,7 +4,7 @@
// SlicerQT
//
#ifdef Slicer_USE_QT
# ifdef Slicer3_USE_PYTHONQT
# ifdef Slicer_USE_PYTHONQT
# include "PythonQt.h"
# include "PythonQt_QtAll.h"
# endif
......
......@@ -155,10 +155,10 @@ install(TARGETS ${lib_name}
)
# --------------------------------------------------------------------------
# Create Python wrappers if Slicer3_USE_PYTHONQT is ON and if VTK is wrapped in Python
# Create Python wrappers if Slicer_USE_PYTHONQT is ON and if VTK is wrapped in Python
#
IF(Slicer3_USE_PYTHONQT AND BUILD_SHARED_LIBS)
IF(Slicer_USE_PYTHONQT AND BUILD_SHARED_LIBS)
SET(KIT_PYTHON_LIBRARIES ${VTK_LIBRARIES})
......@@ -187,7 +187,7 @@ IF(Slicer3_USE_PYTHONQT AND BUILD_SHARED_LIBS)
LIBRARY DESTINATION ${Slicer_INSTALL_BIN_DIR} COMPONENT Runtime
ARCHIVE DESTINATION ${Slicer_INSTALL_LIB_DIR} COMPONENT Development)
ENDIF(Slicer3_USE_PYTHONQT AND BUILD_SHARED_LIBS)
ENDIF(Slicer_USE_PYTHONQT AND BUILD_SHARED_LIBS)
# --------------------------------------------------------------------------
# Testing (requires some of the examples)
......
......@@ -15,7 +15,7 @@ SET(Slicer_PYTHON_SCRIPTS
SET(Slicer_PYTHON_RESOURCES
)
IF(Slicer3_USE_PYTHONQT_WITH_TCL)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
LIST(APPEND Slicer_PYTHON_SCRIPTS
slicer/slicerqt-with-tcl
tpycl/__init__
......@@ -38,7 +38,7 @@ Slicer_compile_python_scripts(
# Testing
#
if(Slicer3_BUILD_TESTING)
IF(Slicer3_USE_PYTHONQT_WITH_TCL)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
add_subdirectory(tpycl/Testing)
ENDIF()
endif(Slicer3_BUILD_TESTING)
......@@ -79,7 +79,7 @@ SET(KIT_resources
)
# Python wrap
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
LIST(APPEND KIT_target_libraries
CTKScriptingPythonCore
......@@ -106,7 +106,7 @@ IF(Slicer3_USE_PYTHONQT)
qSlicerBaseQTCorePythonQtDecorators.h
)
ENDIF(Slicer3_USE_PYTHONQT)
ENDIF(Slicer_USE_PYTHONQT)
Slicer_build_slicer_qtbase_library(
NAME ${PROJECT_NAME}
......
......@@ -32,10 +32,10 @@
// - Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR
// - Slicer_INSTALL_PLUGINS_BIN_DIR
// - Slicer_INSTALL_LIB_DIR
// - Slicer3_USE_PYTHONQT
// - Slicer_USE_PYTHONQT
#include "vtkSlicerConfigure.h"
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
// PythonQt includes
#include <PythonQt.h>
#endif
......@@ -45,7 +45,7 @@
#include "qSlicerModuleManager.h"
#include "qSlicerCoreIOManager.h"
#include "qSlicerCoreCommandOptions.h"
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
# include "qSlicerCorePythonManager.h"
#endif
......@@ -146,7 +146,7 @@ public:
/// Indicate if initialize() method has been called.
bool Initialized;
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
///
/// CorePythonManager - It should exist only one instance of the CorePythonManager
QSharedPointer<qSlicerCorePythonManager> CorePythonManager;
......@@ -400,7 +400,7 @@ void qSlicerCoreApplication::initialize(bool& exitWhenDone)
// Instanciate moduleManager
d->ModuleManager = QSharedPointer<qSlicerModuleManager>(new qSlicerModuleManager);
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
// Initialize Python
if (this->corePythonManager())
{
......@@ -605,7 +605,7 @@ QString qSlicerCoreApplication::slicerHome() const
}
//-----------------------------------------------------------------------------
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
//-----------------------------------------------------------------------------
void qSlicerCoreApplication::setCorePythonManager(qSlicerCorePythonManager* manager)
......
......@@ -27,7 +27,7 @@
// CTK includes
#include <ctkPimpl.h>
#include "vtkSlicerConfigure.h" // For Slicer3_USE_KWWIDGETS, Slicer3_USE_PYTHONQT
#include "vtkSlicerConfigure.h" // For Slicer3_USE_KWWIDGETS, Slicer_USE_PYTHONQT
#include "qSlicerBaseQTCoreExport.h"
......@@ -36,7 +36,7 @@ class qSlicerCoreIOManager;
class qSlicerCoreCommandOptions;
class qSlicerCoreApplicationPrivate;
class qSlicerModuleManager;
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
class qSlicerCorePythonManager;
#endif
class vtkSlicerApplicationLogic;
......@@ -124,7 +124,7 @@ public:
/// Return true is this instance of Slicer is running from an installed directory
bool isInstalled()const;
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
///
/// Get python manager
qSlicerCorePythonManager* corePythonManager()const;
......
......@@ -93,9 +93,9 @@ SET(KIT_MOC_SRCS
)
# PythonQt decorator
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
LIST(APPEND KIT_MOC_SRCS qSlicerBaseQTGUIPythonQtDecorators.h)
ENDIF(Slicer3_USE_PYTHONQT)
ENDIF(Slicer_USE_PYTHONQT)
# UI files
SET(KIT_UI_SRCS
......@@ -114,7 +114,7 @@ SET(KIT_target_libraries
)
# Python wrap
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
LIST(APPEND KIT_target_libraries
CTKScriptingPythonWidgets
CTKWidgetsPythonQt
......@@ -133,7 +133,7 @@ SET(KIT_resources
)
# Python wrap
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
# Sources
LIST(APPEND KIT_SRCS
......@@ -146,7 +146,7 @@ IF(Slicer3_USE_PYTHONQT)
qSlicerPythonManager.h
)
ENDIF(Slicer3_USE_PYTHONQT)
ENDIF(Slicer_USE_PYTHONQT)
Slicer_build_slicer_qtbase_library(
NAME ${PROJECT_NAME}
......
......@@ -44,7 +44,7 @@
#include "qSlicerCommandOptions.h"
#include "qSlicerLayoutManager.h"
#include "qSlicerStyle.h"
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
# include "qSlicerPythonManager.h"
#endif
......@@ -136,7 +136,7 @@ void qSlicerApplicationPrivate::init()
// will be responsible to delete it
q->setCoreIOManager(new qSlicerIOManager);
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
// Note: qSlicerCoreApplication class takes ownership of the pythonManager and
// will be responsible to delete it
q->setCorePythonManager(new qSlicerPythonManager());
......@@ -263,7 +263,7 @@ qSlicerIOManager* qSlicerApplication::ioManager()
return _ioManager;
}
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
//-----------------------------------------------------------------------------
qSlicerPythonManager* qSlicerApplication::pythonManager()
{
......
......@@ -36,7 +36,7 @@
class qSlicerApplicationPrivate;
class qSlicerCommandOptions;
class qSlicerIOManager;
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
class qSlicerPythonManager;
#endif
class qSlicerLayoutManager;
......@@ -67,7 +67,7 @@ public:
/// Get IO Manager
qSlicerIOManager* ioManager();
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
/// Get Python Manager
qSlicerPythonManager * pythonManager();
#endif
......
......@@ -42,7 +42,7 @@
#include "qSlicerLayoutManager.h"
#include "qSlicerLayoutManager_p.h"
#ifdef Slicer3_USE_PYTHONQT_WITH_TCL
#ifdef Slicer_USE_PYTHONQT_WITH_TCL
#include "qSlicerPythonManager.h"
#include "qSlicerApplication.h"
#endif
......@@ -261,7 +261,7 @@ QWidget* qSlicerLayoutManagerPrivate::createSliceWidget(vtkMRMLSliceNode* sliceN
logger.trace(QString("createSliceWidget - instantiated new qMRMLSliceWidget: %1")
.arg(sliceLayoutName));
#ifdef Slicer3_USE_PYTHONQT_WITH_TCL
#ifdef Slicer_USE_PYTHONQT_WITH_TCL
// Note: Python code shouldn't be added to the layout manager itself !
// TODO: move this functionality to the scripted displayable manager...
......@@ -1042,7 +1042,7 @@ CTK_GET_CXX(qSlicerLayoutManager, vtkMRMLViewNode*,
void qSlicerLayoutManager::setScriptedDisplayableManagerDirectory(
const QString& scriptedDisplayableManagerDirectory)
{
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
Q_D(qSlicerLayoutManager);
Q_ASSERT(QFileInfo(scriptedDisplayableManagerDirectory).isDir());
......
......@@ -21,7 +21,7 @@
#include "qSlicerApplication.h"
#include "qSlicerBaseQTGUIPythonQtDecorators.h"
#ifdef Slicer3_USE_PYTHONQT_WITH_TCL
#ifdef Slicer_USE_PYTHONQT_WITH_TCL
// SlicerVTK includes
#include "vtkEventBroker.h"
#endif
......@@ -44,7 +44,7 @@ qSlicerPythonManager::qSlicerPythonManager(QObject* _parent) : Superclass(_paren
//-----------------------------------------------------------------------------
qSlicerPythonManager::~qSlicerPythonManager()
{
#ifdef Slicer3_USE_PYTHONQT_WITH_TCL
#ifdef Slicer_USE_PYTHONQT_WITH_TCL
vtkEventBroker::GetInstance()->SetScriptHandler(0, 0);
#endif
}
......@@ -76,7 +76,7 @@ void qSlicerPythonManager::preInitialization()
// Evaluate application script
this->executeFile(app->slicerHome() + "/bin/Python/slicer/slicerqt.py");
#ifdef Slicer3_USE_PYTHONQT_WITH_TCL
#ifdef Slicer_USE_PYTHONQT_WITH_TCL
// Evaluate application script specific to the TCL layer
// Note that it should be sourced after slicerqt.py
this->executeFile(app->slicerHome() + "/bin/Python/slicer/slicerqt-with-tcl.py");
......@@ -97,7 +97,7 @@ void qSlicerPythonManager::preInitialization()
//-----------------------------------------------------------------------------
void qSlicerPythonManager::eventBrokerScriptHandler(const char *script, void *clientData)
{
#ifdef Slicer3_USE_PYTHONQT_WITH_TCL
#ifdef Slicer_USE_PYTHONQT_WITH_TCL
QString pythonScript = QString("global _tpycl; _tpycl.tcl_callback('%1')").arg(script);
qSlicerPythonManager * self = reinterpret_cast<qSlicerPythonManager*>(clientData);
Q_ASSERT(self);
......
......@@ -43,7 +43,7 @@ SET(SLICER_LIBRARY_PATHS_BUILD
./${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR}/${CTKAPPLAUNCHER_BUILD_TYPE}
)
IF(Slicer3_USE_PYTHONQT_WITH_TCL)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
LIST(APPEND SLICER_LIBRARY_PATHS_BUILD
${Slicer3_TCL_DIR}/lib
)
......@@ -68,7 +68,7 @@ IF(Slicer_USE_OPENIGTLINK)
)
ENDIF()
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
get_filename_component(SLICER_PYTHON_LIB_DIR ${PYTHON_LIBRARY} PATH)
LIST(APPEND SLICER_LIBRARY_PATHS_BUILD ${SLICER_PYTHON_LIB_DIR})
ENDIF()
......@@ -84,7 +84,7 @@ SET(SLICER_PATHS_BUILD
${QT_BINARY_DIR}
)
IF(Slicer3_USE_PYTHONQT_WITH_TCL)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
LIST(APPEND SLICER_PATHS_BUILD
${Slicer3_TCL_DIR}/bin
)
......@@ -97,7 +97,7 @@ SET(SLICER_ENVVARS_BUILD
"QT_PLUGIN_PATH=./bin<PATHSEP>${CTK_DIR}/CTK-build/bin"
)
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
SET(pythonpath_subdir python2.6)
IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
SET(pythonpath_subdir "../Lib")
......@@ -114,7 +114,7 @@ IF(Slicer3_USE_PYTHONQT)
LIST(APPEND SLICER_ENVVARS_BUILD "PYTHONPATH=${PYTHONPATH}")
ENDIF()
IF(Slicer3_USE_PYTHONQT_WITH_TCL)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
# Search locations for TCL packages - space separated list
SET(TCLLIBPATH "${Slicer3_TCL_DIR}/lib/itcl${INCR_TCL_VERSION_DOT}")
SET(TCLLIBPATH "${TCLLIBPATH} ${Slicer3_TCL_DIR}/lib/itk${INCR_TCL_VERSION_DOT}")
......@@ -181,7 +181,7 @@ IF(Slicer_USE_BatchMake)
)
ENDIF()
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
SET(python_subdir "/lib")
IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
SET(python_subdir "/PCbuild")
......@@ -192,7 +192,7 @@ IF(Slicer3_USE_PYTHONQT)
)
ENDIF()
IF(Slicer3_USE_PYTHONQT_WITH_TCL)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
LIST(APPEND SLICER_LIBRARY_PATHS_INSTALLED
./lib/TclTk/lib
./lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}
......@@ -217,7 +217,7 @@ SET(SLICER_ENVVARS_INSTALLED
"QT_PLUGIN_PATH=<APPLAUNCHER_DIR>/${Slicer_INSTALL_LIB_DIR}<PATHSEP><APPLAUNCHER_DIR>/lib/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}"
)
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
SET(pythonpath_subdir python2.6)
IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
SET(pythonpath_subdir "")
......@@ -239,7 +239,7 @@ IF(Slicer3_USE_PYTHONQT)
LIST(APPEND SLICER_ENVVARS_INSTALLED "PYTHONPATH=${PYTHONPATH}")
ENDIF()
IF(Slicer3_USE_PYTHONQT_WITH_TCL)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
# Search locations for TCL packages - space separated list
SET(TCLLIBPATH "<APPLAUNCHER_DIR>/lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}")
SET(TCLLIBPATH "${TCLLIBPATH} <APPLAUNCHER_DIR>/lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}")
......
......@@ -244,7 +244,7 @@ set(SKIP_Teem_BUILD_SETTINGS_FILE 1)
#-----------------------------------------------------------------------------
## Python
option(Slicer3_USE_PYTHON "Integrate a python interpreter into Slicer." OFF)
IF(Slicer3_USE_PYTHON OR Slicer3_USE_PYTHONQT)
IF(Slicer3_USE_PYTHON OR Slicer_USE_PYTHONQT)
find_package(PythonLibs)
find_package(PythonInterp)
ENDIF()
......@@ -271,7 +271,7 @@ IF(Slicer_USE_QT)
INCLUDE(${CTK_USE_FILE})
# Update CMake module path
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CTK_CMAKE_UTILITIES_DIR})
IF(Slicer3_USE_PYTHONQT)
IF(Slicer_USE_PYTHONQT)
SET(PYTHONQT_INSTALL_DIR ${CTK_PYTHONQT_INSTALL_DIR})
LINK_DIRECTORIES(${PYTHONQT_INSTALL_DIR}/lib)
INCLUDE(${CTK_CMAKE_DIR}/ctkMacroWrapPythonQt.cmake)
......@@ -331,12 +331,12 @@ IF(Slicer_USE_QT AND NOT Slicer3_USE_KWWIDGETS)
ENDIF()
#-----------------------------------------------------------------------------
# Add Slicer3_USE_PYTHONQT option if Slicer_USE_QT is ON
# Add Slicer_USE_PYTHONQT option if Slicer_USE_QT is ON
IF(Slicer_USE_QT)
option(Slicer3_USE_PYTHONQT "Integrate a python-QT interpreter into Slicer." OFF)
IF(Slicer3_USE_PYTHONQT)
option(Slicer_USE_PYTHONQT "Integrate a python-QT interpreter into Slicer." OFF)
IF(Slicer_USE_PYTHONQT)
IF(NOT VTK_WRAP_PYTHON)
MESSAGE(FATAL_ERROR "Since both Slicer_USE_QT and Slicer3_USE_PYTHONQT are ON, VTK_WRAP_PYTHON is expected to be ON. Disable Slicer3_USE_PYTHONQT or 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()
# Include convenient script allowing to copy and compile python scripts
INCLUDE(${Slicer_CMAKE_DIR}/SlicerCompilePythonScripts.cmake)
......
......@@ -6,7 +6,7 @@ IF(COMMAND CMAKE_POLICY)
ENDIF(COMMAND CMAKE_POLICY)
MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
SET(MRMLDisplayableManager_USE_PYTHON ${Slicer3_USE_PYTHONQT})
SET(MRMLDisplayableManager_USE_PYTHON ${Slicer_USE_PYTHONQT})
# --------------------------------------------------------------------------
# Include dirs
......
......@@ -154,7 +154,7 @@ void qMRMLSliceWidget::registerDisplayableManagers(const QString& scriptedDispla
QStringList displayableManagers;
//displayableManagers << "vtkSliceDisplayableManager";
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
QFileInfo dirInfo(scriptedDisplayableManagerDirectory);
if (dirInfo.isDir())
{
......
......@@ -250,7 +250,7 @@ void qMRMLThreeDView::registerDisplayableManagers(const QString& scriptedDisplay
<< "vtkMRMLViewDisplayableManager"
<< "vtkMRMLModelDisplayableManager";
#ifdef Slicer3_USE_PYTHONQT
#ifdef Slicer_USE_PYTHONQT
QFileInfo dirInfo(scriptedDisplayableManagerDirectory);
if (dirInfo.isDir())
{
......
......@@ -168,7 +168,7 @@ endif()
# |--------------------------------------------------|
# | Slicer3_USE_PYTHON | ON|OFF | ON|OFF | OFF |
# |--------------------------------------------------|
# | Slicer3_USE_PYTHONQT | OFF | OFF | ON|OFF |
# | Slicer_USE_PYTHONQT | OFF | OFF | ON|OFF |
# |---------------------------------------------------
#
......@@ -190,7 +190,7 @@ endif()
# Note:
# Tcl, Tk, and incrTcl are built in all cases
# blt and iwidgets are build only if Slicer3_USE_KWWIDGETS is ON
# Python is build if either Slicer3_USE_PYTHON or Slicer3_USE_PYTHONQT are ON
# Python is build if either Slicer3_USE_PYTHON or Slicer_USE_PYTHONQT are ON
#
#------------------------------------------------------------------------------
......@@ -242,8 +242,8 @@ if(Slicer_USE_QT)
# Includes Qt headers
INCLUDE(${QT_USE_FILE})
option(Slicer3_USE_PYTHONQT "Integrate a PythonQt interpreter into Slicer." ON)
option(Slicer3_USE_PYTHONQT_WITH_TCL "Enable PythonQt Tcl adapter layer" ON)
option(Slicer_USE_PYTHONQT "Integrate a PythonQt interpreter into Slicer." ON)
option(Slicer_USE_PYTHONQT_WITH_TCL "Enable PythonQt Tcl adapter layer" ON)
option(Slicer_USE_CTKAPPLAUNCHER "Configure ctkAppLauncher." OFF)
mark_as_advanced(Slicer_USE_CTKAPPLAUNCHER)
......@@ -260,7 +260,7 @@ endif()
option(Slicer3_USE_PYTHON "Build Slicer with Python support" OFF)
if(Slicer3_USE_PYTHON OR Slicer3_USE_PYTHONQT)
if(Slicer3_USE_PYTHON OR Slicer_USE_PYTHONQT)
option(Slicer3_BUILD_NUMPY "Build Slicer with NumPy (builds CLapack)." ON)
......@@ -302,13 +302,13 @@ Slicer_USE_QT = ON
message(FATAL_ERROR "${err}")
endif()
if (Slicer3_USE_PYTHON AND Slicer3_USE_PYTHONQT)
set(err "error: Slicer SuperBuild doesn't support Slicer3_USE_PYTHON and Slicer3_USE_PYTHONQT ON.")
if (Slicer3_USE_PYTHON AND Slicer_USE_PYTHONQT)
set(err "error: Slicer SuperBuild doesn't support Slicer3_USE_PYTHON and Slicer_USE_PYTHONQT ON.")
message(FATAL_ERROR "${err}")
endif()
if (Slicer3_USE_KWWIDGETS AND Slicer3_USE_PYTHONQT)
set(err "error: Slicer SuperBuild doesn't support Slicer3_USE_KWWIDGETS and Slicer3_USE_PYTHONQT ON.")
if (Slicer3_USE_KWWIDGETS AND Slicer_USE_PYTHONQT)
set(err "error: Slicer SuperBuild doesn't support Slicer3_USE_KWWIDGETS and Slicer_USE_PYTHONQT ON.")
message(FATAL_ERROR "${err}")
endif()
......@@ -336,7 +336,7 @@ set(incrTcl_DEPENDENCIES tcl tk)
set(iwidgets_DEPENDENCIES tcl itcl)
set(blt_DEPENDENCIES tcl tk)
set(python_DEPENDENCIES)
if(Slicer3_USE_KWWIDGETS OR Slicer3_USE_PYTHONQT_WITH_TCL)
if(Slicer3_USE_KWWIDGETS OR Slicer_USE_PYTHONQT_WITH_TCL)
if(WIN32)
set(python_DEPENDENCIES tcl)
else()
......@@ -351,7 +351,7 @@ set(weave_DEPENDENCIES python NUMPY)
set(VTK_DEPENDENCIES)
set(CTKAPPLAUNCHER_DEPENDENCIES)
set(CTK_DEPENDENCIES VTK)
if(Slicer3_USE_PYTHONQT)
if(Slicer_USE_PYTHONQT)
list(APPEND CTK_DEPENDENCIES python)
endif()
set(KWWidgets_DEPENDENCIES VTK)
......@@ -366,7 +366,7 @@ set(slicer_DEPENDENCIES VTK Insight BatchMake OpenIGTLink teem cmcurl)
# Conditionnaly include ExternalProject Target
#------------------------------------------------------------------------------
if(Slicer3_USE_KWWIDGETS OR Slicer3_USE_PYTHONQT_WITH_TCL)
if(Slicer3_USE_KWWIDGETS OR Slicer_USE_PYTHONQT_WITH_TCL)
include(External_Tcl)
include(External_Tk)
include(External_incrTcl)
......@@ -376,7 +376,7 @@ if(Slicer3_USE_KWWIDGETS)
include(External_blt)
endif()
if(Slicer3_USE_PYTHON OR Slicer3_USE_PYTHONQT)
if(Slicer3_USE_PYTHON OR Slicer_USE_PYTHONQT)
include(External_Python26)
if(Slicer3_BUILD_NUMPY)
include(External_CLAPACK)
......@@ -420,7 +420,7 @@ if(Slicer3_USE_KWWIDGETS)
endif()
endif()
if (Slicer3_USE_PYTHONQT_WITH_TCL)
if (Slicer_USE_PYTHONQT_WITH_TCL)
if(UNIX)
list(APPEND slicer_DEPENDENCIES itcl)
endif()
......@@ -433,7 +433,7 @@ if(Slicer_USE_QT)
endif()
endif()
if(Slicer3_USE_PYTHON OR Slicer3_USE_PYTHONQT)
if(Slicer3_USE_PYTHON OR Slicer_USE_PYTHONQT)
list(APPEND slicer_DEPENDENCIES python)
if(Slicer3_BUILD_NUMPY)
list(APPEND slicer_DEPENDENCIES NUMPY)
......@@ -502,8 +502,8 @@ ExternalProject_Add(${proj}
-DSLICERLIBCURL_DIR:PATH=${CMAKE_BINARY_DIR}/cmcurl-build
# Python
-DSlicer3_USE_PYTHON:BOOL=${Slicer3_USE_PYTHON}
-DSlicer3_USE_PYTHONQT:BOOL=${Slicer3_USE_PYTHONQT}
-DSlicer3_USE_PYTHONQT_WITH_TCL:BOOL=${Slicer3_USE_PYTHONQT_WITH_TCL}
-DSlicer_USE_PYTHONQT:BOOL=${Slicer_USE_PYTHONQT}
-DSlicer_USE_PYTHONQT_WITH_TCL:BOOL=${Slicer_USE_PYTHONQT_WITH_TCL}
-DSlicer3_USE_SYSTEM_PYTHON:BOOL=OFF
-DSlicer3_USE_NUMPY:BOOL=${Slicer3_BUILD_NUMPY}
-DPYTHON_EXECUTABLE:FILEPATH=${slicer_PYTHON_EXECUTABLE}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment