Commit 4067247c authored by jcfr's avatar jcfr

COMP: Remove reference to Slicer_INSTALL_MODULES_*_DIR variables

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16350 3bd1e089-480b-0410-8dfb-8563597acbee
parent e325b90e
......@@ -88,8 +88,8 @@ const char* vtkSlicerModuleLogic::GetModuleShareDirectory()
#endif
vtksys::SystemTools::ReplaceString(
library_directory,
Slicer_INSTALL_MODULES_LIB_DIR,
Slicer_INSTALL_MODULES_SHARE_DIR
Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR,
Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR
);
vtksys_stl::string share_directory =
library_directory + "/" + module_name;
......@@ -106,7 +106,7 @@ const char* vtkSlicerModuleLogic::GetModuleShareDirectory()
{
vtksys_stl::string directory(env);
vtksys::SystemTools::ConvertToUnixSlashes(directory);
directory = directory + '/' + Slicer_INSTALL_MODULES_SHARE_DIR;
directory = directory + '/' + Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR;
if (this->GetModuleName())
{
directory = directory + '/' + this->GetModuleName();
......@@ -136,8 +136,8 @@ const char* vtkSlicerModuleLogic::GetModuleLibDirectory()
vtksys_stl::string directory(share_dir);
vtksys::SystemTools::ReplaceString(
directory,
Slicer_INSTALL_MODULES_SHARE_DIR,
Slicer_INSTALL_MODULES_LIB_DIR
Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR,
Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR
);
this->SetModuleLibDirectory(directory.c_str());
}
......
......@@ -299,11 +299,6 @@ SET(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/Plugins")
SET(Slicer_INSTALL_PLUGINS_SHARE_DIR "${Slicer_INSTALL_SHARE_DIR}/Plugins")
SET(Slicer_INSTALL_PLUGINS_CACHE_DIR "${Slicer_INSTALL_LIB_DIR}/PluginsCache")
SET(Slicer_INSTALL_MODULES_BIN_DIR "${Slicer_INSTALL_LIB_DIR}/Modules")
SET(Slicer_INSTALL_MODULES_LIB_DIR "${Slicer_INSTALL_LIB_DIR}/Modules")
SET(Slicer_INSTALL_MODULES_INCLUDE_DIR "${Slicer_INSTALL_INCLUDE_DIR}/Modules")
SET(Slicer_INSTALL_MODULES_SHARE_DIR "${Slicer_INSTALL_SHARE_DIR}/Modules")
SET(Slicer_HOME "${Slicer_BINARY_DIR}")
#-----------------------------------------------------------------------------
......@@ -395,15 +390,6 @@ IF(BUILD_TESTING)
ENDIF()
#-----------------------------------------------------------------------------
# Since modules are KWWidgets based, unset there variables
# Since the module Logic is shared between QTModules and regular Modules,
# the associated BIN, LIB and INCLUDE directory shouldn't be unset
#UNSET(Slicer_INSTALL_MODULES_BIN_DIR)
#UNSET(Slicer_INSTALL_MODULES_LIB_DIR)
#UNSET(Slicer_INSTALL_MODULES_INCLUDE_DIR)
UNSET(Slicer_INSTALL_MODULES_SHARE_DIR)
#-----------------------------------------------------------------------------
# Python
#-----------------------------------------------------------------------------
......
......@@ -91,7 +91,7 @@ file(GLOB TESTFILES "${CMAKE_CURRENT_SOURCE_DIR}/Testing/test*Script")
# get_filename_component(filename "${file}" NAME)
# configure_file(
# ${file}
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_MODULES_SHARE_DIR}/${PROJECT_NAME}/Testing/${filename}
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR}/${PROJECT_NAME}/Testing/${filename}
# COPYONLY)
# endforeach(file)
#
......@@ -101,7 +101,7 @@ file(GLOB TESTFILES "${CMAKE_CURRENT_SOURCE_DIR}/Testing/test*Script")
# ${RAWGZFILES}
# ${LOGFILES}
# ${TESTFILES}
# DESTINATION ${Slicer_INSTALL_MODULES_SHARE_DIR}/${PROJECT_NAME}/Testing COMPONENT Development
# DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR}/${PROJECT_NAME}/Testing COMPONENT Development
# )
set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary")
......
......@@ -55,7 +55,7 @@ file(GLOB TESTFILES "${CMAKE_CURRENT_SOURCE_DIR}/Testing/test*Script")
# get_filename_component(filename "${file}" NAME)
# configure_file(
# ${file}
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_MODULES_SHARE_DIR}/${PROJECT_NAME}/Testing/${filename}
# ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR}/${PROJECT_NAME}/Testing/${filename}
# COPYONLY)
# endforeach(file)
#
......@@ -65,7 +65,7 @@ file(GLOB TESTFILES "${CMAKE_CURRENT_SOURCE_DIR}/Testing/test*Script")
# ${RAWGZFILES}
# ${LOGFILES}
# ${TESTFILES}
# DESTINATION ${Slicer_INSTALL_MODULES_SHARE_DIR}/${PROJECT_NAME}/Testing COMPONENT Development
# DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR}/${PROJECT_NAME}/Testing COMPONENT Development
# )
set(TEMP "${Slicer_BINARY_DIR}/Testing/Temporary")
......
......@@ -83,10 +83,6 @@ set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@")
set(Slicer_INSTALL_PLUGINS_SHARE_DIR "@Slicer_INSTALL_PLUGINS_SHARE_DIR@")
set(Slicer_INSTALL_PLUGINS_CACHE_DIR "@Slicer_INSTALL_PLUGINS_CACHE_DIR@")
set(Slicer_INSTALL_MODULES_BIN_DIR "@Slicer_INSTALL_MODULES_BIN_DIR@")
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@")
set(Slicer_USE_QT "@Slicer_USE_QT@")
set(Slicer_BUILD_QTLOADABLEMODULES "@Slicer_BUILD_QTLOADABLEMODULES@")
......
......@@ -128,11 +128,6 @@ set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@")
set(Slicer_INSTALL_PLUGINS_SHARE_DIR "@Slicer_INSTALL_PLUGINS_SHARE_DIR@")
set(Slicer_INSTALL_PLUGINS_CACHE_DIR "@Slicer_INSTALL_PLUGINS_CACHE_DIR@")
set(Slicer_INSTALL_MODULES_BIN_DIR "@Slicer_INSTALL_MODULES_BIN_DIR@")
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(Slicer_USE_QT AND Slicer_BUILD_QTLOADABLEMODULES)
set(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR@")
set(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@")
......
......@@ -298,7 +298,6 @@ proc launch_SetEnvironment {} {
set ::env(Slicer_BIN_DIR) $::env(Slicer_HOME)/bin
set ::env(Slicer_PLUGINS_DIR) $::env(Slicer_HOME)/@Slicer_INSTALL_PLUGINS_LIB_DIR@
set ::env(Slicer_MODULES_DIR) $::env(Slicer_HOME)/@Slicer_INSTALL_MODULES_LIB_DIR@
set ::env(Slicer_QTLOADABLEMODULES_DIR) $::env(Slicer_HOME)/@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@
# QtDesigner variable
......@@ -481,7 +480,6 @@ proc launch_SetEnvironment {} {
set ::env(Slicer_LIB_DIR) [file normalize "$::Slicer_HOME/lib/$::BUILD_SUBDIR"]
set ::env(Slicer_PLUGINS_DIR) [file normalize "$::env(Slicer_HOME)/@Slicer_INSTALL_PLUGINS_LIB_DIR@/$::BUILD_SUBDIR"]
set ::env(Slicer_MODULES_DIR) [file normalize "$::env(Slicer_HOME)/@Slicer_INSTALL_MODULES_LIB_DIR@/$::BUILD_SUBDIR"]
set ::env(Slicer_QTLOADABLEMODULES_DIR) [file normalize "$::env(Slicer_HOME)/@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@/$::BUILD_SUBDIR"]
......@@ -664,7 +662,6 @@ proc launch_SetPaths {} {
set ::env(LD_LIBRARY_PATH) $::env(qMRMLWidgets_DIR):$::env(LD_LIBRARY_PATH)
set ::env(LD_LIBRARY_PATH) $::env(Slicer_LIB_DIR):$::env(LD_LIBRARY_PATH)
set ::env(LD_LIBRARY_PATH) $::env(Slicer_PLUGINS_DIR):$::env(LD_LIBRARY_PATH)
set ::env(LD_LIBRARY_PATH) $::env(Slicer_MODULES_DIR):$::env(LD_LIBRARY_PATH)
set ::env(LD_LIBRARY_PATH) $::env(Slicer_QTLOADABLEMODULES_DIR):$::env(LD_LIBRARY_PATH)
set ::env(LD_LIBRARY_PATH) $::env(X11_LIB_DIR):$::env(LD_LIBRARY_PATH)
set ::env(LD_LIBRARY_PATH) $::env(SFW_LIB_DIR):$::env(LD_LIBRARY_PATH)
......@@ -673,7 +670,6 @@ proc launch_SetPaths {} {
set ::env(PATH) "$::env(PATH):$::env(Teem_DIR)"
set ::env(PATH) "$::env(Slicer_BIN_DIR):$::env(PATH)"
set ::env(PATH) "$::env(Slicer_PLUGINS_DIR):$::env(PATH)"
set ::env(PATH) "$::env(Slicer_MODULES_DIR):$::env(PATH)"
set ::env(PATH) "$::env(Slicer_QTLOADABLEMODULES_DIR):$::env(PATH)"
set ::env(PATH) "$::env(QT_BINARY_DIR):$::env(PATH)"
set ::env(QTDESIGNER_EXE) "designer"
......@@ -720,13 +716,11 @@ proc launch_SetPaths {} {
set ::env(DYLD_LIBRARY_PATH) $::env(qMRMLWidgets_DIR):$::env(DYLD_LIBRARY_PATH)
set ::env(DYLD_LIBRARY_PATH) $::env(Slicer_LIB_DIR):$::env(DYLD_LIBRARY_PATH)
set ::env(DYLD_LIBRARY_PATH) $::env(Slicer_PLUGINS_DIR):$::env(DYLD_LIBRARY_PATH)
set ::env(DYLD_LIBRARY_PATH) $::env(Slicer_MODULES_DIR):$::env(DYLD_LIBRARY_PATH)
set ::env(DYLD_LIBRARY_PATH) $::env(Slicer_QTLOADABLEMODULES_DIR):$::env(DYLD_LIBRARY_PATH)
set ::env(PATH) "$::env(PATH):$::env(TCL_DIR)/bin"
set ::env(PATH) "$::env(PATH):$::env(Teem_DIR)"
set ::env(PATH) "$::env(Slicer_BIN_DIR):$::env(PATH)"
set ::env(PATH) "$::env(Slicer_PLUGINS_DIR):$::env(PATH)"
set ::env(PATH) "$::env(Slicer_MODULES_DIR):$::env(PATH)"
set ::env(PATH) "$::env(Slicer_QTLOADABLEMODULES_DIR):$::env(PATH)"
set ::env(PATH) "$::env(QT_BINARY_DIR):$::env(PATH)"
set ::env(QTDESIGNER_EXE) "Designer.app/Contents/MacOS/Designer"
......@@ -780,7 +774,6 @@ proc launch_SetPaths {} {
set ::env(Path) $::env(Slicer_BIN_DIR)\;$::env(Path)
set ::env(Path) $::env(Slicer_LIB_DIR)\;$::env(Path)
set ::env(Path) $::env(Slicer_PLUGINS_DIR)\;$::env(Path)
set ::env(Path) $::env(Slicer_MODULES_DIR)\;$::env(Path)
set ::env(Path) $::env(Slicer_QTLOADABLEMODULES_DIR)\;$::env(Path)
set ::env(Path) $::env(QT_BINARY_DIR)\;$::env(Path)
set ::env(QTDESIGNER_EXE) "designer.exe"
......
......@@ -43,11 +43,6 @@
#define Slicer_INSTALL_PLUGINS_SHARE_DIR "@Slicer_INSTALL_PLUGINS_SHARE_DIR@"
#define Slicer_INSTALL_PLUGINS_CACHE_DIR "@Slicer_INSTALL_PLUGINS_CACHE_DIR@"
#define Slicer_INSTALL_MODULES_BIN_DIR "@Slicer_INSTALL_MODULES_BIN_DIR@"
#define Slicer_INSTALL_MODULES_LIB_DIR "@Slicer_INSTALL_MODULES_LIB_DIR@"
#define Slicer_INSTALL_MODULES_INCLUDE_DIR "@Slicer_INSTALL_MODULES_INCLUDE_DIR@"
#define Slicer_INSTALL_MODULES_SHARE_DIR "@Slicer_INSTALL_MODULES_SHARE_DIR@"
#cmakedefine Slicer_BUILD_QTLOADABLEMODULES
#ifdef Slicer_BUILD_QTLOADABLEMODULES
# define Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "@Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR@"
......
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