Commit a3ecf93c authored by jcfr's avatar jcfr
Browse files

COMP: Rename *Slicer3Config files into *SlicerConfig

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15114 3bd1e089-480b-0410-8dfb-8563597acbee
parent 6e43fd2f
......@@ -835,13 +835,13 @@ CONFIGURE_FILE(
#-----------------------------------------------------------------------------
# Set up for building against a Slicer build tree and a Slicer installation
#
include(${Slicer_SOURCE_DIR}/GenerateSlicer3Config.cmake)
include(${Slicer_SOURCE_DIR}/GenerateSlicerConfig.cmake)
configure_file(${Slicer_SOURCE_DIR}/CTestConfig.cmake
${Slicer_BINARY_DIR}/${Slicer_INSTALL_LIB_DIR}/CTestConfig.cmake COPYONLY IMMEDIATE)
configure_file(${Slicer_SOURCE_DIR}/UseSlicer3.cmake.in
${Slicer_BINARY_DIR}/UseSlicer3.cmake COPYONLY IMMEDIATE)
configure_file(${Slicer_SOURCE_DIR}/UseSlicer.cmake.in
${Slicer_BINARY_DIR}/UseSlicer.cmake COPYONLY IMMEDIATE)
configure_file(${Slicer_SOURCE_DIR}/CMake/RemoveTemporaryFiles.cmake.in
${Slicer_BINARY_DIR}/CMake/RemoveTemporaryFiles.cmake @ONLY IMMEDIATE)
......@@ -851,8 +851,8 @@ configure_file(${Slicer_SOURCE_DIR}/CMake/Slicer3SampleBuildTest.cmake.in
install(FILES
# ${Slicer_BINARY_DIR}/Slicer3BuildSettings.cmake
${Slicer_SOURCE_DIR}/CTestConfig.cmake
${Slicer_BINARY_DIR}/UseSlicer3.cmake
${Slicer_BINARY_DIR}/Utilities/Slicer3Config.cmake
${Slicer_BINARY_DIR}/UseSlicer.cmake
${Slicer_BINARY_DIR}/Utilities/SlicerConfig.cmake
${Slicer_BINARY_DIR}/lib/Slicer3/SlicerVersion.txt
DESTINATION ${Slicer_INSTALL_LIB_DIR}
COMPONENT Development
......
# Generate the Slicer3Config.cmake file in the build tree and configure one
# Generate the SlicerConfig.cmake file in the build tree and configure one
# for the installation tree. This file tells external project how to use
# Slicer. This provides a mechanism for third party developers to build
# modules against a Slicer installation.
......@@ -21,7 +21,7 @@
SET(TCLAP_DIR_CONFIG ${Slicer_BINARY_DIR}/Libs/SlicerExecutionModel/tclap)
SET(ModuleDescriptionParser_DIR_CONFIG ${Slicer_BINARY_DIR}/Libs/SlicerExecutionModel/ModuleDescriptionParser)
SET(GenerateCLP_DIR_CONFIG ${Slicer_BINARY_DIR}/Libs/SlicerExecutionModel/GenerateCLP)
SET(Slicer_USE_FILE_CONFIG ${Slicer_BINARY_DIR}/UseSlicer3.cmake)
SET(Slicer_USE_FILE_CONFIG ${Slicer_BINARY_DIR}/UseSlicer.cmake)
SET(LoadableModule_DIR_CONFIG ${Slicer_BINARY_DIR}/Libs/LoadableModule)
SET(Slicer_Libs_INCLUDE_DIRS_CONFIG ${Slicer_Libs_INCLUDE_DIRS})
......@@ -41,16 +41,16 @@ SET(PYTHON_LIBRARIES_CONFIG ${PYTHON_LIBRARIES})
SET(BatchMake_DIR_CONFIG ${BatchMake_DIR})
SET(OpenCV_DIR_CONFIG ${OpenCV_DIR})
# Configure Slicer3Config.cmake for the install tree.
# Configure SlicerConfig.cmake for the install tree.
CONFIGURE_FILE(
${Slicer_SOURCE_DIR}/Slicer3Config.cmake.in
${Slicer_BINARY_DIR}/Slicer3Config.cmake @ONLY IMMEDIATE)
${Slicer_SOURCE_DIR}/SlicerConfig.cmake.in
${Slicer_BINARY_DIR}/SlicerConfig.cmake @ONLY IMMEDIATE)
# Settings specific for installation trees
#
# (Note we configure from a different file than use for the build tree)
# Configure Slicer3Config.cmake for the install tree.
# Configure SlicerConfig.cmake for the install tree.
CONFIGURE_FILE(
${Slicer_SOURCE_DIR}/Slicer3InstallConfig.cmake.in
${Slicer_BINARY_DIR}/Utilities/Slicer3Config.cmake @ONLY IMMEDIATE)
${Slicer_SOURCE_DIR}/SlicerInstallConfig.cmake.in
${Slicer_BINARY_DIR}/Utilities/SlicerConfig.cmake @ONLY IMMEDIATE)
......@@ -8,7 +8,7 @@ SET(TCLAP_INCLUDE_DIRS_CONFIG ${TCLAP_SOURCE_DIR}/include)
SET(TCLAP_USE_FILE_CONFIG ${TCLAP_BINARY_DIR}/UseTCLAP.cmake)
# Configure Slicer3Config.cmake for the install tree.
# Configure TCLAPConfig.cmake for the install tree.
CONFIGURE_FILE(${TCLAP_SOURCE_DIR}/TCLAPConfig.cmake.in
${TCLAP_BINARY_DIR}/TCLAPConfig.cmake @ONLY IMMEDIATE)
......@@ -19,6 +19,6 @@ CONFIGURE_FILE(${TCLAP_SOURCE_DIR}/TCLAPConfig.cmake.in
# tclap include files referenced as "tclap/foo.h"
# Configure Slicer3Config.cmake for the install tree.
# Configure TCLAPInstallConfig.cmake for the install tree.
CONFIGURE_FILE(${TCLAP_SOURCE_DIR}/TCLAPInstallConfig.cmake.in
${TCLAP_BINARY_DIR}/install/TCLAPConfig.cmake @ONLY IMMEDIATE)
#
# Slicer3Config.cmake - Slicer3 CMake configuration file for external projects
# SlicerConfig.cmake - Slicer CMake configuration file for external projects
#
# This file is configured by Slicer3 and used by UseSlicer3.cmake module
# to load Slicer3's settings for an external project. External projects
# can use these setting to build new modules against a Slicer3 build tree
# or a Slicer3 installation.
# This file is configured by Slicer and used by UseSlicer.cmake module
# to load Slicer's settings for an external project. External projects
# can use these setting to build new modules against a Slicer build tree
# or a Slicer installation.
#
# The C and C++ flags added by Slicer3 to the cmake-configured flags.
# The C and C++ flags added by Slicer to the cmake-configured flags.
set(Slicer_REQUIRED_C_FLAGS "@Slicer_REQUIRED_C_FLAGS@")
set(Slicer_REQUIRED_CXX_FLAGS "@Slicer_REQUIRED_CXX_FLAGS@")
set(Slicer_REQUIRED_LINK_FLAGS "@Slicer_REQUIRED_LINK_FLAGS@")
# The Slicer3 version number
# The Slicer version number
set(Slicer_VERSION_MAJOR "@Slicer_VERSION_MAJOR@")
set(Slicer_VERSION_MINOR "@Slicer_VERSION_MINOR@")
set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer3 was built with modules and CLI support.
# 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@")
ENDIF(Slicer_USE_QT)
# Whether Slicer3 was built with shared libraries.
# Whether Slicer was built with shared libraries.
set(Slicer_BUILD_SHARED "@BUILD_SHARED_LIBS@")
# Slicer3 options
# Slicer options
set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer_USE_MIDAS "@Slicer_USE_MIDAS@")
set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
......@@ -40,33 +40,33 @@ set(Slicer_HOME "@Slicer_HOME@")
# The CMake macros dir.
set(Slicer_CMAKE_DIR "@Slicer_CMAKE_DIR@")
# Slicer3 Libs libraries. Those listed here should
# Slicer Libs libraries. Those listed here should
# automatically pull in their dependencies.
set(Slicer_Libs_LIBRARIES "@Slicer_Libs_LIBRARIES@")
# Slicer3 Libs library directories.
# Slicer Libs library directories.
set(Slicer_Libs_LIBRARY_DIRS "@Slicer_Libs_LIBRARY_DIRS_CONFIG@")
# Slicer3 Libs include file directories.
# Slicer Libs include file directories.
set(Slicer_Libs_INCLUDE_DIRS "@Slicer_Libs_INCLUDE_DIRS_CONFIG@")
# Slicer3 Base libraries. Those listed here should
# Slicer Base libraries. Those listed here should
# automatically pull in their dependencies.
set(Slicer_Base_LIBRARIES "@Slicer_Base_LIBRARIES@")
# Slicer3 Base library directories.
# Slicer Base library directories.
set(Slicer_Base_LIBRARY_DIRS "@Slicer_Base_LIBRARY_DIRS_CONFIG@")
# Slicer3 Base include file directories.
# Slicer Base include file directories.
set(Slicer_Base_INCLUDE_DIRS "@Slicer_BINARY_DIR@" "@Slicer_Base_INCLUDE_DIRS_CONFIG@")
# The location of the UseSlicer3.cmake file.
# The location of the UseSlicer.cmake file.
set(Slicer_USE_FILE "@Slicer_USE_FILE_CONFIG@")
# The build settings file.
set(Slicer_BUILD_SETTINGS_FILE "@Slicer_BUILD_SETTINGS_FILE@")
# The Slicer3 relative install directories.
# The Slicer relative install directories.
set(Slicer_INSTALL_BIN_DIR "@Slicer_INSTALL_BIN_DIR@")
set(Slicer_INSTALL_LIB_DIR "@Slicer_INSTALL_LIB_DIR@")
set(Slicer_INSTALL_INCLUDE_DIR "@Slicer_INSTALL_INCLUDE_DIR@")
......@@ -91,11 +91,11 @@ IF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
set(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR@")
ENDIF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
# The Slicer3 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@")
# Components needed to build modules from outside a Slicer3 build tree or
# from outside a Slicer3 installation tree
# Components needed to build modules from outside a Slicer build tree or
# from outside a Slicer installation tree
set(TCLAP_DIR "@TCLAP_DIR_CONFIG@")
set(ModuleDescriptionParser_DIR "@ModuleDescriptionParser_DIR_CONFIG@")
set(GenerateCLP_DIR "@GenerateCLP_DIR_CONFIG@")
......
#
# Slicer3Config.cmake - Slicer3 CMake configuration file for external projects
# SlicerConfig.cmake - Slicer CMake configuration file for external projects
#
# This file is configured by Slicer3 and used by UseSlicer3.cmake module
# to load Slicer3's settings for an external project. External projects
# can use these setting to build new modules against a Slicer3 build tree
# or a Slicer3 installation.
# This file is configured by Slicer and used by UseSlicer.cmake module
# to load Slicer's settings for an external project. External projects
# can use these setting to build new modules against a Slicer build tree
# or a Slicer installation.
#
# The C and C++ flags added by Slicer3 to the cmake-configured flags.
# The C and C++ flags added by Slicer to the cmake-configured flags.
set(Slicer_REQUIRED_C_FLAGS "@Slicer_REQUIRED_C_FLAGS@")
set(Slicer_REQUIRED_CXX_FLAGS "@Slicer_REQUIRED_CXX_FLAGS@")
set(Slicer_REQUIRED_LINK_FLAGS "@Slicer_REQUIRED_LINK_FLAGS@")
# The Slicer3 version number
# The Slicer version number
set(Slicer_VERSION_MAJOR "@Slicer_VERSION_MAJOR@")
set(Slicer_VERSION_MINOR "@Slicer_VERSION_MINOR@")
set(Slicer_VERSION_PATCH "@Slicer_VERSION_PATCH@")
# Whether Slicer3 was built with modules and CLI support.
# 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@")
ENDIF(Slicer_USE_QT)
# Whether Slicer3 was built with shared libraries.
# Whether Slicer was built with shared libraries.
set(Slicer_BUILD_SHARED "@BUILD_SHARED_LIBS@")
# Slicer3 options
# Slicer options
set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer_USE_IGSTK "@Slicer_USE_IGSTK@")
set(Slicer_USE_MIDAS "@Slicer_USE_MIDAS@")
......@@ -48,11 +48,11 @@ get_filename_component(Slicer_HOME ${Slicer_HOME} ABSOLUTE)
# The CMake macros dir.
set(Slicer_CMAKE_DIR "${Slicer_HOME}/@Slicer_INSTALL_LIB_DIR@/CMake")
# Slicer3 Libs libraries. Those listed here should
# Slicer Libs libraries. Those listed here should
# automatically pull in their dependencies.
set(Slicer_Libs_LIBRARIES "@Slicer_Libs_LIBRARIES@")
# Slicer3 Libs library directories.
# Slicer Libs library directories.
set(Slicer_Libs_LIBRARY_DIRS
"${Slicer_HOME}/lib/FreeSurfer"
"${Slicer_HOME}/lib/IGT"
......@@ -64,7 +64,7 @@ set(Slicer_Libs_LIBRARY_DIRS
"${Slicer_HOME}/lib/ModuleDescriptionParser"
"${Slicer_HOME}/lib/Qdec"
"${Slicer_HOME}/lib/RemoteIO"
"${Slicer_HOME}/lib/Slicer3IO"
"${Slicer_HOME}/lib/SlicerIO"
"${Slicer_HOME}/lib/tclap"
"${Slicer_HOME}/lib/vtkITK"
"${Slicer_HOME}/lib/vtkTeem"
......@@ -73,7 +73,7 @@ set(Slicer_Libs_LIBRARY_DIRS
"${Slicer_HOME}/lib/TclTk/lib/itk@INCR_TCL_VERSION_DOT@"
)
# Slicer3 Libs include file directories.
# Slicer Libs include file directories.
set(Slicer_Libs_INCLUDE_DIRS
"${Slicer_HOME}/include/FreeSurfer"
"${Slicer_HOME}/include/IGT"
......@@ -91,16 +91,16 @@ set(Slicer_Libs_INCLUDE_DIRS
"${Slicer_HOME}/include/vtkTeem"
)
# Slicer3 Base libraries. Those listed here should
# Slicer Base libraries. Those listed here should
# automatically pull in their dependencies.
set(Slicer_Base_LIBRARIES "@Slicer_Base_LIBRARIES@")
# Slicer3 Base library directories.
# Slicer Base library directories.
set(Slicer_Base_LIBRARY_DIRS
"${Slicer_HOME}/@Slicer_INSTALL_LIB_DIR@"
)
# Slicer3 Base include file directories.
# Slicer Base include file directories.
set(Slicer_Base_INCLUDE_DIRS
"${Slicer_HOME}/@Slicer_INSTALL_INCLUDE_DIR@"
"${Slicer_HOME}/@Slicer_INSTALL_INCLUDE_DIR@/SlicerBaseCLI"
......@@ -108,14 +108,14 @@ set(Slicer_Base_INCLUDE_DIRS
"${Slicer_HOME}/@Slicer_INSTALL_INCLUDE_DIR@/SlicerBaseLogic"
)
# The location of the UseSlicer3.cmake file.
set(Slicer_USE_FILE "${Slicer_CONFIG_DIR}/UseSlicer3.cmake")
# The location of the UseSlicer.cmake file.
set(Slicer_USE_FILE "${Slicer_CONFIG_DIR}/UseSlicer.cmake")
# The build settings file.
set(Slicer_BUILD_SETTINGS_FILE
"${Slicer_CONFIG_DIR}/Slicer3BuildSettings.cmake")
"${Slicer_CONFIG_DIR}/SlicerBuildSettings.cmake")
# The Slicer3 relative install directories.
# The Slicer relative install directories.
set(Slicer_INSTALL_BIN_DIR "@Slicer_INSTALL_BIN_DIR@")
set(Slicer_INSTALL_LIB_DIR "@Slicer_INSTALL_LIB_DIR@")
set(Slicer_INSTALL_INCLUDE_DIR "@Slicer_INSTALL_INCLUDE_DIR@")
......@@ -140,8 +140,8 @@ IF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
set(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR@")
ENDIF(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
# Components needed to build modules from outside a Slicer3 build tree or
# from outside a Slicer3 installation tree
# Components needed to build modules from outside a Slicer build tree or
# from outside a Slicer installation tree
set(TCLAP_DIR "${Slicer_HOME}/lib/tclap")
set(ModuleDescriptionParser_DIR "${Slicer_HOME}/lib/ModuleDescriptionParser")
set(GenerateCLP_DIR "${Slicer_HOME}/lib/GenerateCLP")
......
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