Commit 24050ede authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_BUILD_CLI into Slicer_BUILD_CLI

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15087 3bd1e089-480b-0410-8dfb-8563597acbee
parent 9c965b64
PROJECT(Applications)
IF(Slicer3_BUILD_CLI)
IF(Slicer_BUILD_CLI)
ADD_SUBDIRECTORY(CLI)
ENDIF(Slicer3_BUILD_CLI)
ENDIF(Slicer_BUILD_CLI)
IF (Slicer3_USE_KWWIDGETS)
ADD_SUBDIRECTORY(GUI)
......
......@@ -37,10 +37,10 @@ if(BUILD_SHARED_LIBS)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
endif(Slicer3_BUILD_MODULES)
if(Slicer3_BUILD_CLI)
if(Slicer_BUILD_CLI)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\" CONFIG_DIR_POST")
endif(Slicer3_BUILD_CLI)
endif(Slicer_BUILD_CLI)
else(WIN32)
set(Slicer3_FORWARD_PATH_BUILD
"\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${Teem_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
......@@ -50,19 +50,19 @@ if(BUILD_SHARED_LIBS)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\"")
endif(Slicer3_BUILD_MODULES)
if(Slicer3_BUILD_CLI)
if(Slicer_BUILD_CLI)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
endif(Slicer3_BUILD_CLI)
endif(Slicer_BUILD_CLI)
endif(WIN32)
if(Slicer3_BUILD_MODULES)
set(Slicer3_FORWARD_PATH_INSTALL
"${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_MODULES_BIN_DIR}\"")
endif(Slicer3_BUILD_MODULES)
if(Slicer3_BUILD_CLI)
if(Slicer_BUILD_CLI)
set(Slicer3_FORWARD_PATH_INSTALL
"${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
endif(Slicer3_BUILD_CLI)
endif(Slicer_BUILD_CLI)
endif(BUILD_SHARED_LIBS)
# Add main server executables.
......@@ -160,9 +160,9 @@ if(Slicer3_BUILD_MODULES)
add_definitions(-DSlicer3_BUILD_MODULES)
endif(Slicer3_BUILD_MODULES)
if(Slicer3_BUILD_CLI)
add_definitions(-DSlicer3_BUILD_CLI)
endif(Slicer3_BUILD_CLI)
if(Slicer_BUILD_CLI)
add_definitions(-DSlicer_BUILD_CLI)
endif(Slicer_BUILD_CLI)
if(Slicer3_USE_PYTHON AND PYTHON_INCLUDE_PATH)
set(dir_list ${dir_list} ${PYTHON_INCLUDE_PATH})
......@@ -234,13 +234,13 @@ if(Slicer3_BUILD_MODULES)
SlicerTractographyFiducialSeeding
)
else(Slicer3_BUILD_MODULES)
# if Slicer3_BUILD_CLI is ON, we still need at least the CommandLineModule
# 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(Slicer3_BUILD_CLI)
if(Slicer_BUILD_CLI)
target_link_libraries(Slicer3${Slicer3_EXE_SUFFIX}
CommandLineModule
)
endif(Slicer3_BUILD_CLI)
endif(Slicer_BUILD_CLI)
endif(Slicer3_BUILD_MODULES)
if(Slicer3_USE_PYTHON AND PYTHON_LIBRARIES)
......
......@@ -136,7 +136,7 @@ extern "C" {
#include "vtkScriptedModuleGUI.h"
#endif
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#include "vtkCommandLineModuleLogic.h"
#include "vtkCommandLineModuleGUI.h"
#endif
......@@ -192,7 +192,7 @@ extern "C" int Vtkteem_Init(Tcl_Interp *interp);
#if !defined(DAEMON_DEBUG) && defined(Slicer3_BUILD_MODULES)
extern "C" int Slicerdaemon_Init(Tcl_Interp *interp);
#endif
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
extern "C" int Commandlinemodule_Init(Tcl_Interp *interp);
#endif
#if !defined(SCRIPTEDMODULE_DEBUG) && defined(Slicer3_BUILD_MODULES)
......@@ -740,7 +740,7 @@ int Slicer3_main(int& argc, char *argv[])
#if !defined(DAEMON_DEBUG) && defined(Slicer3_BUILD_MODULES)
Slicerdaemon_Init(interp);
#endif
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
Commandlinemodule_Init(interp);
#endif
#if !defined(SCRIPTEDMODULE_DEBUG) && defined(Slicer3_BUILD_MODULES)
......@@ -1617,7 +1617,7 @@ int Slicer3_main(int& argc, char *argv[])
}
#endif
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
std::vector<std::string> moduleNames;
std::vector<std::string>::const_iterator mit;
if ( slicerApp->GetLoadCommandLineModules()
......@@ -1837,7 +1837,7 @@ int Slicer3_main(int& argc, char *argv[])
slicerApp->Script ("namespace eval slicer3 set Broker [vtkEventBroker New]");
//slicerApp->Script ("namespace eval slicer3 set Broker [vtkEventBroker GetInstance]");
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
mit = moduleNames.begin();
while ( mit != moduleNames.end() )
{
......@@ -2240,7 +2240,7 @@ int Slicer3_main(int& argc, char *argv[])
appGUI->RemoveGUIObservers ( );
appGUI->SetAndObserveMainSliceLogic ( NULL, NULL, NULL );
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
// remove the observers from the factory discovered modules
// (as we remove the observers, cache the GUIs in a vector so we
// can delete them later).
......@@ -2415,7 +2415,7 @@ int Slicer3_main(int& argc, char *argv[])
// cout << "vtkSlicerApplicationGUI deleting app GUI\n";
// appGUI->Delete ();
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
// delete the factory discovered module GUIs (as we delete the
// GUIs, cache the associated logic instances so we can delete
std::vector<vtkSlicerModuleGUI*>::iterator git;
......@@ -2483,7 +2483,7 @@ int Slicer3_main(int& argc, char *argv[])
appLogic->TerminateProcessingThread();
appLogic->Delete ();
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer3_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
#if !defined(COMMANDLINE_DEBUG) && (defined(Slicer_BUILD_CLI) || defined(Slicer3_BUILD_MODULES))
// delete the factory discovered module Logics
std::vector<vtkSlicerModuleLogic*>::iterator lit;
for (lit = moduleLogics.begin(); lit != moduleLogics.end(); ++lit)
......
......@@ -64,11 +64,11 @@ IF(BUILD_SHARED_LIBS)
# "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
#ENDIF(Slicer3_BUILD_MODULES)
IF(Slicer3_BUILD_CLI)
IF(Slicer_BUILD_CLI)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\" CONFIG_DIR_POST")
ENDIF(Slicer3_BUILD_CLI)
ENDIF(Slicer_BUILD_CLI)
ELSE(WIN32)
......@@ -131,11 +131,11 @@ IF(BUILD_SHARED_LIBS)
# "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\"")
#ENDIF(Slicer3_BUILD_MODULES)
IF(Slicer3_BUILD_CLI)
IF(Slicer_BUILD_CLI)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
ENDIF(Slicer3_BUILD_CLI)
ENDIF(Slicer_BUILD_CLI)
ENDIF(WIN32)
# IF(Slicer3_BUILD_MODULES)
......@@ -143,10 +143,10 @@ IF(BUILD_SHARED_LIBS)
# "${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_MODULES_BIN_DIR}\"")
# ENDIF(Slicer3_BUILD_MODULES)
IF(Slicer3_BUILD_CLI)
IF(Slicer_BUILD_CLI)
SET(SlicerQT_FORWARD_PATH_INSTALL
"${SlicerQT_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
ENDIF(Slicer3_BUILD_CLI)
ENDIF(Slicer_BUILD_CLI)
ENDIF(BUILD_SHARED_LIBS)
......@@ -286,9 +286,9 @@ set(include_dirs
# add_definitions(-DSlicer3_BUILD_MODULES)
# endif(Slicer3_BUILD_MODULES)
#
# if(Slicer3_BUILD_CLI)
# add_definitions(-DSlicer3_BUILD_CLI)
# endif(Slicer3_BUILD_CLI)
# if(Slicer_BUILD_CLI)
# add_definitions(-DSlicer_BUILD_CLI)
# endif(Slicer_BUILD_CLI)
# if(Slicer3_USE_PYTHON AND PYTHON_INCLUDE_PATH)
# set(include_dirs ${include_dirs} ${PYTHON_INCLUDE_PATH})
......@@ -360,13 +360,13 @@ INCLUDE_DIRECTORIES(${include_dirs})
# SlicerTractographyFiducialSeeding
# )
# else(Slicer3_BUILD_MODULES)
# # if Slicer3_BUILD_CLI is ON, we still need at least the CommandLineModule
# # 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(Slicer3_BUILD_CLI)
# if(Slicer_BUILD_CLI)
# target_link_libraries(Slicer3${Slicer3_EXE_SUFFIX}
# CommandLineModule
# )
# endif(Slicer3_BUILD_CLI)
# endif(Slicer_BUILD_CLI)
# endif(Slicer3_BUILD_MODULES)
# if(Slicer3_USE_PYTHON AND PYTHON_LIBRARIES)
......
......@@ -107,7 +107,7 @@ BUILD_SHARED_LIBS:BOOL=@BUILD_SHARED_LIBS@
BUILD_TESTING:BOOL=@BUILD_TESTING@
BUILD_EXAMPLES:BOOL=@BUILD_EXAMPLES@
Slicer3_BUILD_CLI:BOOL=@Slicer3_BUILD_CLI@
Slicer_BUILD_CLI:BOOL=@Slicer_BUILD_CLI@
Slicer3_BUILD_MODULES:BOOL=@Slicer3_BUILD_MODULES@
Slicer_BUILD_QTLOADABLEMODULES:BOOL=@Slicer_BUILD_QTLOADABLEMODULES@
Slicer3_BUILD_WIN32_CONSOLE:BOOL=@Slicer3_BUILD_WIN32_CONSOLE@
......
......@@ -663,7 +663,7 @@ ENDIF()
#-----------------------------------------------------------------------------
# Modules and CLI
#
option(Slicer3_BUILD_CLI "Build Slicer3 CLI Plugins" ON)
option(Slicer_BUILD_CLI "Build Slicer3 CLI Plugins" ON)
IF(Slicer3_USE_KWWIDGETS)
option(Slicer3_BUILD_MODULES "Build Slicer3 Modules" ON)
ENDIF()
......@@ -676,11 +676,11 @@ IF(Slicer3_USE_KWWIDGETS)
IF(Slicer3_BUILD_MODULES)
add_subdirectory(Modules)
else(Slicer3_BUILD_MODULES)
# if Slicer3_BUILD_CLI is ON, we still need at least the CommandLineModule
# 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(Slicer3_BUILD_CLI)
IF(Slicer_BUILD_CLI)
add_subdirectory(Modules/CommandLineModule)
ENDIF(Slicer3_BUILD_CLI)
ENDIF(Slicer_BUILD_CLI)
ENDIF(Slicer3_BUILD_MODULES)
ENDIF()
......
......@@ -19,7 +19,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer3 was built with modules and CLI support.
set(Slicer3_BUILD_MODULES "@Slicer3_BUILD_MODULES@")
set(Slicer3_BUILD_CLI "@Slicer3_BUILD_CLI@")
set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@")
IF(Slicer3_USE_QT)
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
ENDIF(Slicer3_USE_QT)
......
......@@ -19,7 +19,7 @@ set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer3 was built with modules and CLI support.
set(Slicer3_BUILD_MODULES "@Slicer3_BUILD_MODULES@")
set(Slicer3_BUILD_CLI "@Slicer3_BUILD_CLI@")
set(Slicer_BUILD_CLI "@Slicer_BUILD_CLI@")
IF(Slicer3_USE_QT)
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
ENDIF(Slicer3_USE_QT)
......
......@@ -280,7 +280,7 @@ option(Slicer3_USE_VTK_DEBUG_LEAKS
"Turn on VTKs Debug Leaks functionality in both VTK and Slicer." ON)
# Enable the build of Command line module
option(Slicer3_BUILD_CLI "Build Slicer3 CLI Plugins" ON)
option(Slicer_BUILD_CLI "Build Slicer3 CLI Plugins" ON)
#------------------------------------------------------------------------------
# Validate options
......@@ -480,7 +480,7 @@ ExternalProject_Add(${proj}
# Slicer specific options
-DBUILD_EXAMPLES:BOOL=OFF
-DBUILD_TESTING:BOOL=ON
-DSlicer3_BUILD_CLI:BOOL=${Slicer3_BUILD_CLI}
-DSlicer_BUILD_CLI:BOOL=${Slicer_BUILD_CLI}
# ITK
-DITK_DIR:PATH=${ITK_DIR}
# Teem
......
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