diff --git a/Utilities/otbopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/CMakeLists.txt index e97525fc314b59490c30393e3e87a2366c384fb4..50e73702e63b4f81a51934d2e90a0bf6261665d7 100644 --- a/Utilities/otbopenjpeg/CMakeLists.txt +++ b/Utilities/otbopenjpeg/CMakeLists.txt @@ -160,9 +160,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle_private.h.cmake.in #----------------------------------------------------------------------------- # pkgconfig support CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY) -INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -INSTALL( CODE - "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") +#INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) +#INSTALL( CODE +# "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") #----------------------------------------------------------------------------- # Compiler specific flags: @@ -284,31 +284,18 @@ ENDIF(BUILD_TESTING) #----------------------------------------------------------------------------- # install all targets referenced as OPENJPEGTargets -INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) -CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in - ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake - @ONLY -) -INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake - DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR} -) +#INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) +#CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in +# ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake +# @ONLY +#) +#INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake +# DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR} +#) #----------------------------------------------------------------------------- # install CHANGES and LICENSE -INSTALL( - FILES CHANGES - LICENSE - DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) - - -#----------------------------------------------------------------------------- -# otb added -IF(NOT OTB_INSTALL_NO_DEVELOPMENT) - # Install OTB specifics includes files - - INSTALL(FILES otb_openjpeg.h otb_openjpeg_mangle.h - DESTINATION ${OTB_INSTALL_INCLUDE_DIR_CM24}/Utilities/otbopenjpeg - COMPONENT Development) - -ENDIF(NOT OTB_INSTALL_NO_DEVELOPMENT) - +#INSTALL( +# FILES CHANGES +# LICENSE +# DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) diff --git a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt index 5efa8c292ef101968899cfa1367c18487ffb2c74..1f94fe04e55c7d3cd8b84c2c51e54ea9666f4422 100644 --- a/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt +++ b/Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt @@ -53,21 +53,21 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME} ) # Install includes files -INSTALL(FILES openjpeg.h - DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers -) -INSTALL(CODE - "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)") +#INSTALL(FILES openjpeg.h +# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers +#) +#INSTALL(CODE +# "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)") -INSTALL(FILES ${OPENJPEG_BINARY_DIR}/openjpeg_mangle.h - DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers -) -INSTALL(CODE - "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${OPENJPEG_INSTALL_SUBDIR}/openjpeg_mangle.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg_mangle.h)") +#INSTALL(FILES ${OPENJPEG_BINARY_DIR}/openjpeg_mangle.h +# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers +#) +#INSTALL(CODE +# "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${OPENJPEG_INSTALL_SUBDIR}/openjpeg_mangle.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg_mangle.h)") # install man page of the library -INSTALL( - FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjpeg.3 - DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) +#INSTALL( +# FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjpeg.3 +# DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)