Commit 9c965b64 authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_BUILD_QTLOADABLEMODULES into Slicer_BUILD_QTLOADABLEMODULES

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15086 3bd1e089-480b-0410-8dfb-8563597acbee
parent a5634ce9
......@@ -45,7 +45,7 @@ IF(BUILD_SHARED_LIBS)
# \"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",
# \"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\"")
IF(Slicer3_BUILD_QTLOADABLEMODULES)
IF(Slicer_BUILD_QTLOADABLEMODULES)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\" CONFIG_DIR_POST")
......@@ -57,7 +57,7 @@ IF(BUILD_SHARED_LIBS)
"${Slicer3_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
ENDIF(Slicer3_BUILD_QTLOADABLEMODULES)
ENDIF(Slicer_BUILD_QTLOADABLEMODULES)
#IF(Slicer3_BUILD_MODULES)
# SET(Slicer3_FORWARD_PATH_BUILD
......@@ -111,7 +111,7 @@ IF(BUILD_SHARED_LIBS)
\"../lib/vtkITK\", \\
\"../lib/vtkTeem\"")
IF(Slicer3_BUILD_QTLOADABLEMODULES)
IF(Slicer_BUILD_QTLOADABLEMODULES)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
......@@ -124,7 +124,7 @@ IF(BUILD_SHARED_LIBS)
"${Slicer3_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\"")
ENDIF(Slicer3_BUILD_QTLOADABLEMODULES)
ENDIF(Slicer_BUILD_QTLOADABLEMODULES)
#IF(Slicer3_BUILD_MODULES)
# SET(Slicer3_FORWARD_PATH_BUILD
......
......@@ -109,7 +109,7 @@ BUILD_EXAMPLES:BOOL=@BUILD_EXAMPLES@
Slicer3_BUILD_CLI:BOOL=@Slicer3_BUILD_CLI@
Slicer3_BUILD_MODULES:BOOL=@Slicer3_BUILD_MODULES@
Slicer3_BUILD_QTLOADABLEMODULES:BOOL=@Slicer3_BUILD_QTLOADABLEMODULES@
Slicer_BUILD_QTLOADABLEMODULES:BOOL=@Slicer_BUILD_QTLOADABLEMODULES@
Slicer3_BUILD_WIN32_CONSOLE:BOOL=@Slicer3_BUILD_WIN32_CONSOLE@
Slicer_USE_BatchMake:BOOL=@Slicer_USE_BatchMake@
Slicer3_USE_IGSTK:BOOL=@Slicer3_USE_IGSTK@
......
......@@ -500,9 +500,9 @@ set(vtkITK_DIR ${Slicer3_BINARY_DIR}/Libs/vtkITK)
# Qt Loadable Modules
#
IF(Slicer3_USE_QT)
OPTION(Slicer3_BUILD_QTLOADABLEMODULES "Build Slicer3 QT Loadable Modules" ON)
IF(Slicer3_BUILD_QTLOADABLEMODULES)
ADD_DEFINITIONS(-DSlicer3_BUILD_QTLOADABLEMODULES)
OPTION(Slicer_BUILD_QTLOADABLEMODULES "Build Slicer3 QT Loadable Modules" ON)
IF(Slicer_BUILD_QTLOADABLEMODULES)
ADD_DEFINITIONS(-DSlicer_BUILD_QTLOADABLEMODULES)
set(Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR "${Slicer_INSTALL_LIB_DIR}/QTLoadableModules")
set(Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR "${Slicer_INSTALL_LIB_DIR}/QTLoadableModules")
set(Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/QTLoadableModules")
......@@ -689,7 +689,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 Slicer3_USE_KWWIDGETS is OFF
IF(Slicer3_BUILD_MODULES OR Slicer3_BUILD_QTLOADABLEMODULES)
IF(Slicer3_BUILD_MODULES OR Slicer_BUILD_QTLOADABLEMODULES)
include("${Slicer_CMAKE_DIR}/Slicer3ModulesMacros.cmake")
ADD_SUBDIRECTORY(Modules/EMSegment/Algorithm)
ADD_SUBDIRECTORY(Modules/EMSegment/MRML)
......@@ -709,7 +709,7 @@ ENDIF()
#-----------------------------------------------------------------------------
# Qt Loadable Modules
#
IF(Slicer3_USE_QT AND Slicer3_BUILD_QTLOADABLEMODULES)
IF(Slicer3_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
add_subdirectory(QTModules)
ENDIF()
......
......@@ -21,7 +21,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
set(Slicer3_BUILD_MODULES "@Slicer3_BUILD_MODULES@")
set(Slicer3_BUILD_CLI "@Slicer3_BUILD_CLI@")
IF(Slicer3_USE_QT)
set(Slicer3_BUILD_QTLOADABLEMODULES "@Slicer3_BUILD_QTLOADABLEMODULES@")
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
ENDIF(Slicer3_USE_QT)
# Whether Slicer3 was built with shared libraries.
......@@ -84,12 +84,12 @@ set(Slicer_INSTALL_MODULES_LIB_DIR "@Slicer_INSTALL_MODULES_LIB_DIR@")
set(Slicer_INSTALL_MODULES_INCLUDE_DIR "@Slicer_INSTALL_MODULES_INCLUDE_DIR@")
set(Slicer_INSTALL_MODULES_SHARE_DIR "@Slicer_INSTALL_MODULES_SHARE_DIR@")
IF(Slicer3_USE_QT AND Slicer3_BUILD_QTLOADABLEMODULES)
IF(Slicer3_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
set(Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR@")
set(Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR@")
set(Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@")
set(Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR@")
ENDIF(Slicer3_USE_QT AND Slicer3_BUILD_QTLOADABLEMODULES)
ENDIF(Slicer3_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
# The Slicer3 install prefix (*not* defined in the install tree)
set(Slicer3_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
......
......@@ -21,7 +21,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
set(Slicer3_BUILD_MODULES "@Slicer3_BUILD_MODULES@")
set(Slicer3_BUILD_CLI "@Slicer3_BUILD_CLI@")
IF(Slicer3_USE_QT)
set(Slicer3_BUILD_QTLOADABLEMODULES "@Slicer3_BUILD_QTLOADABLEMODULES@")
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
ENDIF(Slicer3_USE_QT)
# Whether Slicer3 was built with shared libraries.
......@@ -133,12 +133,12 @@ set(Slicer_INSTALL_MODULES_LIB_DIR "@Slicer_INSTALL_MODULES_LIB_DIR@")
set(Slicer_INSTALL_MODULES_INCLUDE_DIR "@Slicer_INSTALL_MODULES_INCLUDE_DIR@")
set(Slicer_INSTALL_MODULES_SHARE_DIR "@Slicer_INSTALL_MODULES_SHARE_DIR@")
IF(Slicer3_USE_QT AND Slicer3_BUILD_QTLOADABLEMODULES)
IF(Slicer3_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
set(Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR@")
set(Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR@")
set(Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@")
set(Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR@")
ENDIF(Slicer3_USE_QT AND Slicer3_BUILD_QTLOADABLEMODULES)
ENDIF(Slicer3_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
# Components needed to build modules from outside a Slicer3 build tree or
# from outside a Slicer3 installation tree
......
......@@ -51,12 +51,12 @@
#define Slicer_INSTALL_MODULES_INCLUDE_DIR "@Slicer_INSTALL_MODULES_INCLUDE_DIR@"
#define Slicer_INSTALL_MODULES_SHARE_DIR "@Slicer_INSTALL_MODULES_SHARE_DIR@"
#ifdef Slicer3_BUILD_QTLOADABLEMODULES
#ifdef Slicer_BUILD_QTLOADABLEMODULES
# define Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR@"
# define Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR@"
# define Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@"
# define Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR@"
#endif //Slicer3_BUILD_QTLOADABLEMODULES
#endif //Slicer_BUILD_QTLOADABLEMODULES
/* Do not use those variables unless you can not retrieve the Tcl/Tk version
at run-time using this code below:
......
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