From ff5b5b82eff9279cc2eccfc1e74fe6fdf4a36692 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sat, 23 Jun 2012 12:44:26 +0200
Subject: [PATCH] COMP: missing COMPONENT in install() calls
---
CMake/OTBWrapperMacros.cmake | 6 +++--
.../ApplicationLauncherQt/CMakeLists.txt | 12 +++++-----
Code/Wrappers/CommandLine/CMakeLists.txt | 18 ++++++++-------
Code/Wrappers/QtWidget/CMakeLists.txt | 6 ++---
Code/Wrappers/SWIG/CMakeLists.txt | 22 +++++++++++--------
Utilities/BGL/boost/CMakeLists.txt | 6 +++--
Utilities/otbkml/CMakeLists.txt | 3 ++-
.../otbopenjpeg/libopenjpeg/CMakeLists.txt | 3 ++-
8 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/CMake/OTBWrapperMacros.cmake b/CMake/OTBWrapperMacros.cmake
index 64f1cd1c7b..1aa60f43c0 100644
--- a/CMake/OTBWrapperMacros.cmake
+++ b/CMake/OTBWrapperMacros.cmake
@@ -36,7 +36,8 @@ macro(OTB_CREATE_APPLICATION)
if (APPLICATION_INSTALL_PATH)
install(TARGETS ${APPLICATION_TARGET_NAME}
- LIBRARY DESTINATION ${APPLICATION_INSTALL_PATH})
+ LIBRARY DESTINATION ${APPLICATION_INSTALL_PATH}
+ COMPONENT RuntimeLibraries)
endif()
# Generate a quickstart script in the build dir
@@ -103,7 +104,8 @@ macro(OTB_CREATE_APPLICATION)
if (OTB_INSTALL_BIN_DIR)
# Install a version of this script if we are inside the OTB build
install(PROGRAMS ${SCRIPT_GUI_INSTALLABLE}
- DESTINATION ${OTB_INSTALL_BIN_DIR})
+ DESTINATION ${OTB_INSTALL_BIN_DIR}
+ COMPONENT RuntimeLibraries)
endif()
endif()
#endif(NOT WIN32)
diff --git a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
index 832c6f5c83..76f1be1cd6 100644
--- a/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
+++ b/Code/Wrappers/ApplicationLauncherQt/CMakeLists.txt
@@ -12,9 +12,9 @@ target_link_libraries(otbApplicationLauncherQt
${QT_LIBRARIES})
install(TARGETS otbApplicationLauncherQt
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
+ RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
# Where we will install the script in the build tree
get_target_property(CLI_OUPUT_DIR otbApplicationLauncherQt RUNTIME_OUTPUT_DIRECTORY)
@@ -41,7 +41,8 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.bat.installtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui.bat
@ONLY )
install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui.bat
- DESTINATION ${OTB_INSTALL_BIN_DIR})
+ DESTINATION ${OTB_INSTALL_BIN_DIR}
+ COMPONENT RuntimeLibraries)
else()
configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.sh.buildtree.in
@@ -54,7 +55,8 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.sh.installtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui
@ONLY )
install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui
- DESTINATION ${OTB_INSTALL_BIN_DIR})
+ DESTINATION ${OTB_INSTALL_BIN_DIR}
+ COMPONENT RuntimeLibraries)
endif()
diff --git a/Code/Wrappers/CommandLine/CMakeLists.txt b/Code/Wrappers/CommandLine/CMakeLists.txt
index a0f45b1668..f3940e26aa 100644
--- a/Code/Wrappers/CommandLine/CMakeLists.txt
+++ b/Code/Wrappers/CommandLine/CMakeLists.txt
@@ -8,9 +8,9 @@ IF(OTB_LIBRARY_PROPERTIES)
ENDIF(OTB_LIBRARY_PROPERTIES)
install(TARGETS OTBWrapperCommandLine
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
+ RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
@@ -23,9 +23,9 @@ target_link_libraries(otbApplicationLauncherCommandLine
OTBApplicationEngine)
install(TARGETS otbApplicationLauncherCommandLine
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
+ RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
# Where we will install the script in the build tree
get_target_property(CLI_OUPUT_DIR otbApplicationLauncherCommandLine RUNTIME_OUTPUT_DIRECTORY)
@@ -50,7 +50,8 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.bat.installtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli.bat
@ONLY )
install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli.bat
- DESTINATION ${OTB_INSTALL_BIN_DIR})
+ DESTINATION ${OTB_INSTALL_BIN_DIR}
+ COMPONENT RuntimeLibraries)
else()
configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.sh.buildtree.in
@@ -63,6 +64,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.sh.installtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli
@ONLY )
install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli
- DESTINATION ${OTB_INSTALL_BIN_DIR})
+ DESTINATION ${OTB_INSTALL_BIN_DIR}
+ COMPONENT RuntimeLibraries)
endif()
diff --git a/Code/Wrappers/QtWidget/CMakeLists.txt b/Code/Wrappers/QtWidget/CMakeLists.txt
index 686886c8fa..26e8627584 100644
--- a/Code/Wrappers/QtWidget/CMakeLists.txt
+++ b/Code/Wrappers/QtWidget/CMakeLists.txt
@@ -46,6 +46,6 @@ ENDIF(OTB_LIBRARY_PROPERTIES)
install(TARGETS OTBWrapperQtWidget
- RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR}
- LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR}
- ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR})
+ RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
diff --git a/Code/Wrappers/SWIG/CMakeLists.txt b/Code/Wrappers/SWIG/CMakeLists.txt
index 6bd7ea4ff0..0c3855ad8e 100644
--- a/Code/Wrappers/SWIG/CMakeLists.txt
+++ b/Code/Wrappers/SWIG/CMakeLists.txt
@@ -66,11 +66,13 @@ if ( OTB_WRAP_PYTHON )
)
install( TARGETS _otbApplication
- DESTINATION ${OTB_INSTALL_PYTHON_DIR} )
+ DESTINATION ${OTB_INSTALL_PYTHON_DIR}
+ COMPONENT RuntimeLibraries )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/otbApplication.py
${CMAKE_CURRENT_BINARY_DIR}/otbApplication.pyc
- DESTINATION ${OTB_INSTALL_PYTHON_DIR} )
+ DESTINATION ${OTB_INSTALL_PYTHON_DIR}
+ COMPONENT RuntimeLibraries )
endif()
@@ -123,7 +125,9 @@ if ( OTB_WRAP_JAVA )
# Prefer using OTB_INSTALL_JAVA_DIR which defaults to something that honors CMAKE_INSTALL_PREFIX
# Using the system-wide Java extension dir usually require admin privileges,
# and shall better be left to packagers.
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.otb.application.jar DESTINATION ${OTB_INSTALL_JAVA_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.otb.application.jar
+ DESTINATION ${OTB_INSTALL_JAVA_DIR}
+ COMPONENT RuntimeLibraries )
endif()
@@ -161,9 +165,9 @@ if ( OTB_WRAP_LUA )
endif()
install(TARGETS otbApplicationLua
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development )
endif()
@@ -186,9 +190,9 @@ if ( OTB_WRAP_RUBY )
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/otbApplicationRUBY_wrap.cxx COMPILE_FLAGS "-w")
install(TARGETS otbapplication
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ RUNTIME DESTINATION ${OTB_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+ LIBRARY DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+ ARCHIVE DESTINATION ${OTB_INSTALL_LIB_DIR} COMPONENT Development)
endif()
diff --git a/Utilities/BGL/boost/CMakeLists.txt b/Utilities/BGL/boost/CMakeLists.txt
index c838648bc3..fbe037b942 100644
--- a/Utilities/BGL/boost/CMakeLists.txt
+++ b/Utilities/BGL/boost/CMakeLists.txt
@@ -3,10 +3,12 @@ IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/BGL/
- FILES_MATCHING PATTERN "*.hpp")
+ FILES_MATCHING PATTERN "*.hpp"
+ COMPONENT Development)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/BGL/
- FILES_MATCHING PATTERN "*.ipp")
+ FILES_MATCHING PATTERN "*.ipp"
+ COMPONENT Development)
ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbkml/CMakeLists.txt b/Utilities/otbkml/CMakeLists.txt
index cb900fae6d..6916131c47 100644
--- a/Utilities/otbkml/CMakeLists.txt
+++ b/Utilities/otbkml/CMakeLists.txt
@@ -276,5 +276,6 @@ ENDIF(NOT OTB_INSTALL_NO_LIBRARIES)
IF(NOT OTB_INSTALL_NO_DEVELOPMENT)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/kml
DESTINATION ${OTB_INSTALL_INCLUDE_DIR}/Utilities/otbkml/
- FILES_MATCHING PATTERN "*.h")
+ FILES_MATCHING PATTERN "*.h"
+ COMPONENT Development)
ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT)
diff --git a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
index 84a441aa5e..1d5b29ce65 100644
--- a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
+++ b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
@@ -49,7 +49,8 @@ ENDIF(BUILD_JPWL)
# Install library
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
EXPORT OpenJPEGTargets
- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+ DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
+ COMPONENT RuntimeLibraries
)
# Install includes files
--
GitLab