Commit 1300d6a6 authored by millerjv's avatar millerjv
Browse files

ENH: Changes in the Slicer3 installation layout to simplify navigation. Most...

ENH: Changes in the Slicer3 installation layout to simplify navigation.  Most things will now try install themselves under <Installation Directory>/lib/<Package> or <Installation Directory>/include/<Package>.  For example, <Installation Directory>/lib/Slicer3, <Installation Directory>/lib/MRML, <Installation Directory>/lib/ModuleDescriptionParser.  This allows setting include and library paths consistently using ../<SomeOtherPackage> or ../../include/<SomeOtherPackage>, etc.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@5665 3bd1e089-480b-0410-8dfb-8563597acbee
parent f56d2fd9
......@@ -141,8 +141,8 @@ TARGET_LINK_LIBRARIES(${LIB_NAME}
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS ${LIB_NAME}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
# The name of our executable and the corresponding source file.
......
......@@ -88,8 +88,8 @@ ADD_LIBRARY(SlicerBaseLogic
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS SlicerBaseLogic
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(SlicerBaseLogic
......
......@@ -49,8 +49,8 @@ ADD_LIBRARY(FreeSurfer
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS FreeSurfer
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(FreeSurfer
......
......@@ -5,7 +5,7 @@ GET_FILENAME_COMPONENT(GenerateCLP_CONFIG_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
SET(GenerateCLP_INCLUDE_DIRS "${GenerateCLP_CONFIG_DIR}/../../include/GenerateCLP")
SET(GenerateCLP_LIBRARY_DIRS "${GenerateCLP_CONFIG_DIR}/..")
SET(GenerateCLP_LIBRARY_DIRS "${GenerateCLP_CONFIG_DIR}")
SET(GenerateCLP_USE_FILE "${GenerateCLP_CONFIG_DIR}/UseGenerateCLP.cmake")
SET(GENERATECLP_EXE "${GenerateCLP_CONFIG_DIR}/../../bin/GenerateCLP")
SET(TCLAP_DIR "${GenerateCLP_CONFIG_DIR}/../tclap")
......
......@@ -83,8 +83,8 @@ ADD_LIBRARY(IGT
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS IGT
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(IGT
......
......@@ -49,12 +49,12 @@ IF(BUILD_SHARED_LIBS)
# Note CommandIO and CommandIOPlugin are installed in different locations
INSTALL(TARGETS CommandIO
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
INSTALL(TARGETS CommandIOPlugin
RUNTIME DESTINATION ${SLICER_INSTALL_LIBRARIES_DIR}/ITKFactories COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${SLICER_INSTALL_LIBRARIES_DIR}/ITKFactories COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
CONFIGURE_FILE(
......
......@@ -59,12 +59,12 @@ IF(BUILD_SHARED_LIBS)
# Note MGHIO and MGHIOPlugin are installed in different locations
INSTALL(TARGETS MGHIO
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
INSTALL(TARGETS MGHIOPlugin
RUNTIME DESTINATION ${SLICER_INSTALL_LIBRARIES_DIR}/ITKFactories COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${SLICER_INSTALL_LIBRARIES_DIR}/ITKFactories COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
CONFIGURE_FILE(
......
......@@ -130,8 +130,8 @@ ADD_LIBRARY(MRML
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS MRML
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/MRML COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/MRML COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(MRML
......
......@@ -41,12 +41,12 @@ IF(BUILD_SHARED_LIBS)
# Note MRMLIDIO and MRMLIDOPlugin are installed in different locations
INSTALL(TARGETS MRMLIDIO
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
INSTALL(TARGETS MRMLIDIOPlugin
RUNTIME DESTINATION ${SLICER_INSTALL_LIBRARIES_DIR}/ITKFactories COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${SLICER_INSTALL_LIBRARIES_DIR}/ITKFactories COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
CONFIGURE_FILE(
......
......@@ -111,8 +111,8 @@ CONFIGURE_FILE(${ModuleDescriptionParser_SOURCE_DIR}/UseModuleDescriptionParser.
INSTALL(TARGETS ModuleDescriptionParser
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/ModuleDescriptionParser COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/ModuleDescriptionParser COMPONENT Development)
FILE(GLOB __files1 "${ModuleDescriptionParser_SOURCE_DIR}/*.h")
INSTALL(FILES ${__files1} DESTINATION include/ModuleDescriptionParser COMPONENT Development)
......
......@@ -5,6 +5,6 @@ GET_FILENAME_COMPONENT(ModuleDescriptionParser_CONFIG_DIR "${CMAKE_CURRENT_LIST_
#
SET(ModuleDescriptionParser_INCLUDE_DIRS "${ModuleDescriptionParser_CONFIG_DIR}/../../include/ModuleDescriptionParser")
SET(ModuleDescriptionParser_LIBRARY_DIRS "${ModuleDescriptionParser_CONFIG_DIR}/..")
SET(ModuleDescriptionParser_LIBRARY_DIRS "${ModuleDescriptionParser_CONFIG_DIR}")
SET(ModuleDescriptionParser_USE_FILE "${ModuleDescriptionParser_CONFIG_DIR}/UseModuleDescriptionParser.cmake")
SET(ITK_DIR "${ModuleDescriptionParser_CONFIG_DIR}/../InsightToolkit")
......@@ -53,8 +53,8 @@ ADD_LIBRARY(Qdec
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS Qdec
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(Qdec
......
......@@ -69,8 +69,8 @@ ADD_LIBRARY(CommandLineModule
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS CommandLineModule
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(CommandLineModule
......
......@@ -138,8 +138,8 @@ ADD_LIBRARY(EMSegment
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS EMSegment
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(EMSegment
......
......@@ -65,8 +65,8 @@ ADD_LIBRARY(GradientAnisotropicDiffusionFilter
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS GradientAnisotropicDiffusionFilter
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(GradientAnisotropicDiffusionFilter
......
......@@ -49,8 +49,8 @@ TARGET_LINK_LIBRARIES( MimxMeshIO
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS MimxMeshIO
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
......
......@@ -57,8 +57,8 @@ ADD_LIBRARY(NeuroNav
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS NeuroNav
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(NeuroNav
......
......@@ -72,8 +72,8 @@ ADD_LIBRARY(QdecModule
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS QdecModule
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(QdecModule
......
......@@ -169,8 +169,8 @@ ADD_LIBRARY(QueryAtlas
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS QueryAtlas
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(QueryAtlas
......
......@@ -67,8 +67,8 @@ ADD_LIBRARY(ScriptedModule
IF(BUILD_SHARED_LIBS)
INSTALL(TARGETS ScriptedModule
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
LIBRARY DESTINATION lib COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib COMPONENT Development)
LIBRARY DESTINATION lib/Slicer3 COMPONENT RuntimeLibraries
ARCHIVE DESTINATION lib/Slicer3 COMPONENT Development)
ENDIF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(ScriptedModule
......
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