Commit 3349bdc5 authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_INSTALL_QTLOADABLEMODULES* into Slicer_INSTALL_QTLOADABLEMODULES*

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15093 3bd1e089-480b-0410-8dfb-8563597acbee
parent 16ec4afc
......@@ -48,9 +48,9 @@ IF(BUILD_SHARED_LIBS)
IF(Slicer_BUILD_QTLOADABLEMODULES)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\" CONFIG_DIR_POST")
\"${Slicer3_HOME}/${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}\" CONFIG_DIR_POST")
SET(SlicerQT_FORWARD_PATH_INSTALL
"\"../${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
"\"../${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
# Since ModuleLogic are in Slicer_INSTALL_MODULES_BIN_DIR, let's add it
SET(Slicer3_FORWARD_PATH_BUILD
......@@ -114,10 +114,10 @@ IF(BUILD_SHARED_LIBS)
IF(Slicer_BUILD_QTLOADABLEMODULES)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
\"${Slicer3_HOME}/${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
SET(SlicerQT_FORWARD_PATH_INSTALL
"${SlicerQT_FORWARD_PATH_INSTALL}, \\
\"../${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
\"../${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
# Since ModuleLogic are in Slicer_INSTALL_MODULES_BIN_DIR, let's add it
SET(Slicer3_FORWARD_PATH_BUILD
......
......@@ -29,7 +29,7 @@
#include <QVector>
// For:
// - Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR
// - Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR
// - Slicer_INSTALL_PLUGINS_BIN_DIR
// - Slicer_INSTALL_LIB_DIR
// - Slicer_USE_PYTHONQT
......
......@@ -28,7 +28,7 @@
#include "qSlicerUtils.h"
// For:
// - Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR
// - Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR
#include "vtkSlicerConfigure.h"
//-----------------------------------------------------------------------------
......@@ -57,11 +57,11 @@ QStringList qSlicerLoadableModuleFactoryPrivate::modulePaths() const
// in intDir.
QStringList defaultQTModulePaths;
defaultQTModulePaths << app->slicerHome() + "/"
+ Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR;
+ Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR;
if (!app->intDir().isEmpty())
{
defaultQTModulePaths << app->slicerHome() + "/" + Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR + "/" + app->intDir();
defaultQTModulePaths << app->slicerHome() + "/" + Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR + "/" + app->intDir();
}
// add the default modules directory (based on the slicer
......
......@@ -40,7 +40,7 @@ SET(SLICER_LIBRARY_PATHS_BUILD
${Teem_DIR}/bin/${CTKAPPLAUNCHER_BUILD_TYPE}
./bin/${CTKAPPLAUNCHER_BUILD_TYPE}
./${Slicer_INSTALL_PLUGINS_LIB_DIR}/${CTKAPPLAUNCHER_BUILD_TYPE}
./${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR}/${CTKAPPLAUNCHER_BUILD_TYPE}
./${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}/${CTKAPPLAUNCHER_BUILD_TYPE}
)
IF(Slicer_USE_PYTHONQT_WITH_TCL)
......@@ -79,7 +79,7 @@ ENDIF()
SET(SLICER_PATHS_BUILD
./bin/${CTKAPPLAUNCHER_BUILD_TYPE}
./${Slicer_INSTALL_PLUGINS_LIB_DIR}/${CTKAPPLAUNCHER_BUILD_TYPE}
./${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR}/${CTKAPPLAUNCHER_BUILD_TYPE}
./${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}/${CTKAPPLAUNCHER_BUILD_TYPE}
${Teem_DIR}/bin/${CTKAPPLAUNCHER_BUILD_TYPE}
${QT_BINARY_DIR}
)
......@@ -137,7 +137,7 @@ SET(SLICER_LIBRARY_PATHS_INSTALLED
./${Slicer_INSTALL_BIN_DIR}
./${Slicer_INSTALL_LIB_DIR}
./${Slicer_INSTALL_PLUGINS_LIB_DIR}
./${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR}
./${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}
# Slicer Libs
./lib/FreeSurfer
./lib/ITKCommandIO
......@@ -206,7 +206,7 @@ ENDIF()
SET(SLICER_PATHS_INSTALLED
./${Slicer_INSTALL_BIN_DIR}
./${Slicer_INSTALL_PLUGINS_BIN_DIR}
./${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}
./${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}
)
......
......@@ -132,11 +132,11 @@ MACRO(Slicer_build_qtmodule)
SET_TARGET_PROPERTIES(${lib_name}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}"
"${CMAKE_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}"
LIBRARY_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
"${CMAKE_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
ARCHIVE_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
"${CMAKE_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
)
TARGET_LINK_LIBRARIES(${lib_name}
......@@ -155,9 +155,9 @@ MACRO(Slicer_build_qtmodule)
# Install rules
INSTALL(TARGETS ${lib_name}
RUNTIME DESTINATION ${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR} COMPONENT Development
RUNTIME DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR} COMPONENT Development
)
# Install headers
......@@ -165,7 +165,7 @@ MACRO(Slicer_build_qtmodule)
INSTALL(FILES
${headers}
${dynamicHeaders}
DESTINATION ${Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/${QTMODULE_NAME} COMPONENT Development
DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/${QTMODULE_NAME} COMPONENT Development
)
ENDMACRO()
......@@ -503,10 +503,10 @@ IF(Slicer_USE_QT)
OPTION(Slicer_BUILD_QTLOADABLEMODULES "Build Slicer 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")
set(Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR "${Slicer_INSTALL_SHARE_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_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/QTLoadableModules")
set(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "${Slicer_INSTALL_SHARE_DIR}/QTLoadableModules")
ENDIF()
ENDIF()
......
......@@ -87,10 +87,10 @@ file(GLOB TESTFILES "${CMAKE_CURRENT_SOURCE_DIR}/Testing/test*Script")
# )
# In your code, you just need to include: vtkSlicerConfigure.h
# Then, the following 'define' will be available:
# Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR
# Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR
# Slicer3_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR
# Slicer3_INSTALL_QTLOADABLEMODULES_SHARE_DIR
# Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR
# Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR
# Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR
# Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR
#
# get_filename_component(filename "${file}" NAME)
# configure_file(
......
......@@ -85,10 +85,10 @@ set(Slicer_INSTALL_MODULES_INCLUDE_DIR "@Slicer_INSTALL_MODULES_INCLUDE_DIR@")
set(Slicer_INSTALL_MODULES_SHARE_DIR "@Slicer_INSTALL_MODULES_SHARE_DIR@")
IF(Slicer_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@")
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_INCLUDE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@")
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)
......
......@@ -134,10 +134,10 @@ set(Slicer_INSTALL_MODULES_INCLUDE_DIR "@Slicer_INSTALL_MODULES_INCLUDE_DIR@")
set(Slicer_INSTALL_MODULES_SHARE_DIR "@Slicer_INSTALL_MODULES_SHARE_DIR@")
IF(Slicer_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@")
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_INCLUDE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@")
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
......
......@@ -484,7 +484,7 @@ proc launch_SetEnvironment {} {
set ::env(Slicer3_PLUGINS_DIR) [file normalize "$::env(Slicer3_HOME)/@Slicer_INSTALL_PLUGINS_LIB_DIR@/$::BUILD_SUBDIR"]
set ::env(Slicer3_MODULES_DIR) [file normalize "$::env(Slicer3_HOME)/@Slicer_INSTALL_MODULES_LIB_DIR@/$::BUILD_SUBDIR"]
set ::env(Slicer3_QTLOADABLEMODULES_DIR) [file normalize "$::env(Slicer3_HOME)/@Slicer3_INSTALL_QTLOADABLEMODULES_LIB_DIR@/$::BUILD_SUBDIR"]
set ::env(Slicer3_QTLOADABLEMODULES_DIR) [file normalize "$::env(Slicer3_HOME)/@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@/$::BUILD_SUBDIR"]
# QtDesigner variable
......
......@@ -52,10 +52,10 @@
#define Slicer_INSTALL_MODULES_SHARE_DIR "@Slicer_INSTALL_MODULES_SHARE_DIR@"
#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@"
# define Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR@"
# define Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@"
# define Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR@"
# define Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR@"
#endif //Slicer_BUILD_QTLOADABLEMODULES
/* Do not use those variables unless you can not retrieve the Tcl/Tk version
......
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