Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

COMP: Rename Slicer_INSTALL_PLUGINS_LIB_DIR CMake variable into Slice…

…r_INSTALL_CLIMODULES_LIB_DIR

git-svn-id: http://svn.slicer.org/Slicer4/trunk@17857 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
commit bb159072782950dcb42054f8e43d51d435f610ee 1 parent da6cdc3
@jcfr jcfr authored
View
2  CMake/Slicer3PluginsMacros.cmake
@@ -15,7 +15,7 @@ endmacro(slicer3_set_plugins_output_path)
macro(slicer3_install_plugins)
install(TARGETS ${ARGN}
RUNTIME DESTINATION ${Slicer_INSTALL_CLIMODULES_BIN_DIR} COMPONENT RuntimeLibraries
- LIBRARY DESTINATION ${Slicer_INSTALL_PLUGINS_LIB_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${Slicer_INSTALL_CLIMODULES_LIB_DIR} COMPONENT RuntimeLibraries
)
endmacro(slicer3_install_plugins)
View
6 CMake/SlicerBlockCTKAppLauncherSettings.cmake
@@ -80,7 +80,7 @@ set(SLICER_LIBRARY_PATHS_BUILD
${Teem_DIR}/bin/<CMAKE_CFG_INTDIR>
${LibArchive_DIR}/${LIB_SUBDIR}
<APPLAUNCHER_DIR>/bin/<CMAKE_CFG_INTDIR>
- <APPLAUNCHER_DIR>/${Slicer_INSTALL_PLUGINS_LIB_DIR}/<CMAKE_CFG_INTDIR>
+ <APPLAUNCHER_DIR>/${Slicer_INSTALL_CLIMODULES_LIB_DIR}/<CMAKE_CFG_INTDIR>
<APPLAUNCHER_DIR>/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}/<CMAKE_CFG_INTDIR>
)
@@ -135,7 +135,7 @@ endif()
#-----------------------------------------------------------------------------
set(SLICER_PATHS_BUILD
<APPLAUNCHER_DIR>/bin/<CMAKE_CFG_INTDIR>
- <APPLAUNCHER_DIR>/${Slicer_INSTALL_PLUGINS_LIB_DIR}/<CMAKE_CFG_INTDIR>
+ <APPLAUNCHER_DIR>/${Slicer_INSTALL_CLIMODULES_LIB_DIR}/<CMAKE_CFG_INTDIR>
<APPLAUNCHER_DIR>/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}/<CMAKE_CFG_INTDIR>
${Teem_DIR}/bin/<CMAKE_CFG_INTDIR>
${QT_BINARY_DIR}
@@ -199,7 +199,7 @@ endif()
set(SLICER_LIBRARY_PATHS_INSTALLED
<APPLAUNCHER_DIR>/${Slicer_INSTALL_BIN_DIR}
<APPLAUNCHER_DIR>/${Slicer_INSTALL_LIB_DIR}
- <APPLAUNCHER_DIR>/${Slicer_INSTALL_PLUGINS_LIB_DIR}
+ <APPLAUNCHER_DIR>/${Slicer_INSTALL_CLIMODULES_LIB_DIR}
<APPLAUNCHER_DIR>/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}
# External projects
<APPLAUNCHER_DIR>/lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}.${Teem_VERSION_PATCH}
View
4 CMake/SlicerMacroBuildCLI.cmake
@@ -48,7 +48,7 @@ macro(slicerMacroBuildCLI)
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${Slicer_CLIMODULES_LIB_DIR}"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${Slicer_CLIMODULES_LIB_DIR}"
INSTALL_RUNTIME_DESTINATION ${Slicer_INSTALL_CLIMODULES_BIN_DIR}
- INSTALL_LIBRARY_DESTINATION ${Slicer_INSTALL_PLUGINS_LIB_DIR}
- INSTALL_ARCHIVE_DESTINATION ${Slicer_INSTALL_PLUGINS_LIB_DIR}
+ INSTALL_LIBRARY_DESTINATION ${Slicer_INSTALL_CLIMODULES_LIB_DIR}
+ INSTALL_ARCHIVE_DESTINATION ${Slicer_INSTALL_CLIMODULES_LIB_DIR}
)
endmacro()
View
2  CMakeLists.txt
@@ -265,7 +265,7 @@ set(Slicer_INSTALL_SHARE_DIR "${Slicer_INSTALL_ROOT}${Slicer_SHARE_DIR}")
set(Slicer_INSTALL_ITKFACTORIES_DIR "${Slicer_INSTALL_LIB_DIR}/ITKFactories")
set(Slicer_INSTALL_CLIMODULES_BIN_DIR "${Slicer_INSTALL_ROOT}${Slicer_CLIMODULES_BIN_DIR}")
-set(Slicer_INSTALL_PLUGINS_LIB_DIR "${Slicer_INSTALL_ROOT}${Slicer_CLIMODULES_LIB_DIR}")
+set(Slicer_INSTALL_CLIMODULES_LIB_DIR "${Slicer_INSTALL_ROOT}${Slicer_CLIMODULES_LIB_DIR}")
set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "${Slicer_INSTALL_ROOT}${Slicer_PLUGINS_INCLUDE_DIR}")
set(Slicer_INSTALL_CLIMODULES_SHARE_DIR "${Slicer_INSTALL_ROOT}${Slicer_CLIMODULES_SHARE_DIR}")
View
2  SlicerConfig.cmake.in
@@ -199,7 +199,7 @@ set(Slicer_INSTALL_SHARE_DIR "@Slicer_INSTALL_SHARE_DIR@")
set(Slicer_INSTALL_ITKFACTORIES_DIR "@Slicer_INSTALL_ITKFACTORIES_DIR@")
set(Slicer_INSTALL_CLIMODULES_BIN_DIR "@Slicer_INSTALL_CLIMODULES_BIN_DIR@")
-set(Slicer_INSTALL_PLUGINS_LIB_DIR "@Slicer_INSTALL_PLUGINS_LIB_DIR@")
+set(Slicer_INSTALL_CLIMODULES_LIB_DIR "@Slicer_INSTALL_CLIMODULES_LIB_DIR@")
set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@")
set(Slicer_INSTALL_CLIMODULES_SHARE_DIR "@Slicer_INSTALL_CLIMODULES_SHARE_DIR@")
View
2  SlicerInstallConfig.cmake.in
@@ -109,7 +109,7 @@ set(Slicer_INSTALL_SHARE_DIR "@Slicer_INSTALL_SHARE_DIR@")
set(Slicer_INSTALL_ITKFACTORIES_DIR "@Slicer_INSTALL_ITKFACTORIES_DIR@")
set(Slicer_INSTALL_CLIMODULES_BIN_DIR "@Slicer_INSTALL_CLIMODULES_BIN_DIR@")
-set(Slicer_INSTALL_PLUGINS_LIB_DIR "@Slicer_INSTALL_PLUGINS_LIB_DIR@")
+set(Slicer_INSTALL_CLIMODULES_LIB_DIR "@Slicer_INSTALL_CLIMODULES_LIB_DIR@")
set(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "@Slicer_INSTALL_PLUGINS_INCLUDE_DIR@")
set(Slicer_INSTALL_CLIMODULES_SHARE_DIR "@Slicer_INSTALL_CLIMODULES_SHARE_DIR@")
View
4 SuperBuild/External_SlicerBRAINSTools.cmake
@@ -42,8 +42,6 @@ if(APPLE)
set(Slicer_INSTALL_ROOT "${Slicer_BUNDLE_LOCATION}/")
endif()
-set(Slicer_INSTALL_PLUGINS_LIB_DIR "${Slicer_INSTALL_ROOT}${Slicer_PLUGINS_LIB_DIR}")
-
set(Slicer_HOME "${Slicer_BINARY_DIR}")
#message(STATUS "${__indent}Adding project ${proj}")
ExternalProject_Add(${proj}
@@ -64,7 +62,7 @@ set(Slicer_HOME "${Slicer_BINARY_DIR}")
-DSlicer_PLUGINS_BIN_DIR:PATH=${CMAKE_BINARY_DIR}/Slicer-build/${Slicer_CLIMODULES_BIN_DIR}
-DSlicer_PLUGINS_LIB_DIR:PATH=${CMAKE_BINARY_DIR}/Slicer-build/${Slicer_CLIMODULES_LIB_DIR}
-DSlicer_INSTALL_PLUGINS_BIN_DIR:PATH=${CMAKE_BINARY_DIR}/Slicer-build/${Slicer_INSTALL_CLIMODULES_BIN_DIR}
- -DSlicer_INSTALL_PLUGINS_LIB_DIR:PATH=${CMAKE_BINARY_DIR}/Slicer-build/${Slicer_INSTALL_PLUGINS_LIB_DIR}
+ -DSlicer_INSTALL_PLUGINS_LIB_DIR:PATH=${CMAKE_BINARY_DIR}/Slicer-build/${Slicer_INSTALL_CLIMODULES_LIB_DIR}
#################### Propogate the Slicer Environment
# ITK
-DITK_DIR:PATH=${ITK_DIR}
View
4 launch.tcl.in
@@ -292,7 +292,7 @@ proc launch_SetEnvironment {} {
set ::env(Slicer_LIB_DIR) $::env(SLICER_HOME)/lib/Slicer3
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_PLUGINS_DIR) $::env(SLICER_HOME)/@Slicer_INSTALL_CLIMODULES_LIB_DIR@
set ::env(Slicer_QTLOADABLEMODULES_DIR) $::env(SLICER_HOME)/@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@
# QtDesigner variable
@@ -474,7 +474,7 @@ proc launch_SetEnvironment {} {
set ::env(Slicer_BIN_DIR) [file normalize "$::Slicer_HOME/bin/$::BUILD_SUBDIR"]
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_PLUGINS_DIR) [file normalize "$::env(SLICER_HOME)/@Slicer_INSTALL_CLIMODULES_LIB_DIR@/$::BUILD_SUBDIR"]
set ::env(Slicer_QTLOADABLEMODULES_DIR) [file normalize "$::env(SLICER_HOME)/@Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR@/$::BUILD_SUBDIR"]
Please sign in to comment.
Something went wrong with that request. Please try again.