Commit 5309f1ae authored by jcfr's avatar jcfr

COMP: Change default value of Slicer_INSTALL_ROOT to "."

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16855 3bd1e089-480b-0410-8dfb-8563597acbee
parent 969e1040
......@@ -15,7 +15,7 @@ if(Slicer_USE_PYTHON OR Slicer_USE_PYTHONQT)
install(
DIRECTORY "${PYTHON_DIR}${python_lib_subdir}"
DESTINATION ${Slicer_INSTALL_ROOT}lib/Python${python_lib_subdir}
DESTINATION ${Slicer_INSTALL_ROOT}/lib/Python${python_lib_subdir}
USE_SOURCE_PERMISSIONS
REGEX "lib2to3/" EXCLUDE
REGEX "lib-old/" EXCLUDE
......@@ -28,7 +28,7 @@ if(Slicer_USE_PYTHON OR Slicer_USE_PYTHONQT)
if(UNIX)
slicerInstallLibrary(
FILE ${PYTHON_LIBRARY}
DESTINATION ${Slicer_INSTALL_ROOT}lib/Python/lib
DESTINATION ${Slicer_INSTALL_ROOT}/lib/Python/lib
COMPONENT Runtime
PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ)
elseif(WIN32)
......
......@@ -17,6 +17,6 @@ endif()
foreach(qpi ${qt_plugins})
install(PROGRAMS ${qpi}
DESTINATION ${Slicer_INSTALL_ROOT}lib/QtPlugins/imageformats
DESTINATION ${Slicer_INSTALL_ROOT}/lib/QtPlugins/imageformats
)
endforeach()
......@@ -197,17 +197,17 @@ SET(Slicer_INCLUDE_DIR "include/Slicer")
SET(Slicer_SHARE_DIR "share/Slicer")
SET(Slicer_ITKFACTORIES_DIR "${Slicer_LIB_DIR}/ITKFactories")
SET(Slicer_INSTALL_ROOT "")
SET(Slicer_INSTALL_ROOT ".")
IF(APPLE)
# Set to create Bundle
SET(Slicer_BUNDLE_LOCATION "Slicer.app/Contents")
SET(Slicer_INSTALL_ROOT "${Slicer_BUNDLE_LOCATION}/")
ENDIF()
SET(Slicer_INSTALL_BIN_DIR "${Slicer_INSTALL_ROOT}${Slicer_BIN_DIR}")
SET(Slicer_INSTALL_LIB_DIR "${Slicer_INSTALL_ROOT}${Slicer_LIB_DIR}")
SET(Slicer_INSTALL_INCLUDE_DIR "${Slicer_INSTALL_ROOT}${Slicer_INCLUDE_DIR}")
SET(Slicer_INSTALL_SHARE_DIR "${Slicer_INSTALL_ROOT}${Slicer_SHARE_DIR}")
SET(Slicer_INSTALL_BIN_DIR "${Slicer_INSTALL_ROOT}/${Slicer_BIN_DIR}")
SET(Slicer_INSTALL_LIB_DIR "${Slicer_INSTALL_ROOT}/${Slicer_LIB_DIR}")
SET(Slicer_INSTALL_INCLUDE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_INCLUDE_DIR}")
SET(Slicer_INSTALL_SHARE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_SHARE_DIR}")
SET(Slicer_INSTALL_ITKFACTORIES_DIR "${Slicer_INSTALL_LIB_DIR}/ITKFactories")
#-----------------------------------------------------------------------------
......@@ -267,10 +267,10 @@ SET(Slicer_PLUGINS_LIB_DIR "plugins")
SET(Slicer_PLUGINS_INCLUDE_DIR "${Slicer_INCLUDE_DIR}/plugins")
SET(Slicer_PLUGINS_SHARE_DIR "${Slicer_SHARE_DIR}/plugins")
SET(Slicer_INSTALL_PLUGINS_BIN_DIR "${Slicer_INSTALL_ROOT}${Slicer_PLUGINS_BIN_DIR}")
SET(Slicer_INSTALL_PLUGINS_LIB_DIR "${Slicer_INSTALL_ROOT}${Slicer_PLUGINS_LIB_DIR}")
SET(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "${Slicer_INSTALL_ROOT}${Slicer_PLUGINS_INCLUDE_DIR}")
SET(Slicer_INSTALL_PLUGINS_SHARE_DIR "${Slicer_INSTALL_ROOT}${Slicer_PLUGINS_SHARE_DIR}")
SET(Slicer_INSTALL_PLUGINS_BIN_DIR "${Slicer_INSTALL_ROOT}/${Slicer_PLUGINS_BIN_DIR}")
SET(Slicer_INSTALL_PLUGINS_LIB_DIR "${Slicer_INSTALL_ROOT}/${Slicer_PLUGINS_LIB_DIR}")
SET(Slicer_INSTALL_PLUGINS_INCLUDE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_PLUGINS_INCLUDE_DIR}")
SET(Slicer_INSTALL_PLUGINS_SHARE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_PLUGINS_SHARE_DIR}")
SET(Slicer_HOME "${Slicer_BINARY_DIR}")
......@@ -476,10 +476,10 @@ IF(Slicer_BUILD_QTLOADABLEMODULES)
SET(Slicer_QTLOADABLEMODULES_INCLUDE_DIR "${Slicer_INCLUDE_DIR}/qt-loadable-modules")
SET(Slicer_QTLOADABLEMODULES_SHARE_DIR "${Slicer_SHARE_DIR}/qt-loadable-modules")
SET(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTLOADABLEMODULES_BIN_DIR}")
SET(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTLOADABLEMODULES_LIB_DIR}")
SET(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTLOADABLEMODULES_INCLUDE_DIR}")
SET(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTLOADABLEMODULES_SHARE_DIR}")
SET(Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTLOADABLEMODULES_BIN_DIR}")
SET(Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTLOADABLEMODULES_LIB_DIR}")
SET(Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTLOADABLEMODULES_INCLUDE_DIR}")
SET(Slicer_INSTALL_QTLOADABLEMODULES_SHARE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTLOADABLEMODULES_SHARE_DIR}")
ENDIF()
IF(Slicer_BUILD_QTSCRIPTEDMODULES)
......@@ -488,10 +488,10 @@ IF(Slicer_BUILD_QTSCRIPTEDMODULES)
SET(Slicer_QTSCRIPTEDMODULES_INCLUDE_DIR "${Slicer_INCLUDE_DIR}/qt-scripted-modules")
SET(Slicer_QTSCRIPTEDMODULES_SHARE_DIR "${Slicer_SHARE_DIR}/qt-scripted-modules")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_BIN_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTSCRIPTEDMODULES_BIN_DIR}")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_LIB_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTSCRIPTEDMODULES_LIB_DIR}")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_INCLUDE_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTSCRIPTEDMODULES_INCLUDE_DIR}")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_SHARE_DIR "${Slicer_INSTALL_ROOT}${Slicer_QTSCRIPTEDMODULES_SHARE_DIR}")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_BIN_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTSCRIPTEDMODULES_BIN_DIR}")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_LIB_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTSCRIPTEDMODULES_LIB_DIR}")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_INCLUDE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTSCRIPTEDMODULES_INCLUDE_DIR}")
SET(Slicer_INSTALL_QTSCRIPTEDMODULES_SHARE_DIR "${Slicer_INSTALL_ROOT}/${Slicer_QTSCRIPTEDMODULES_SHARE_DIR}")
ENDIF()
......
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