From af32de46a2cb685a322298f83a7fa49ec1cf5f18 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 26 Oct 2010 16:46:01 +0000 Subject: [PATCH] Installation fixes when using CMake --- CHANGES | 4 ++++ jp3d/libjp3dvm/CMakeLists.txt | 6 ++++++ libopenjpeg/CMakeLists.txt | 2 ++ 3 files changed, 12 insertions(+) diff --git a/CHANGES b/CHANGES index baf574ac..90c75911 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,10 @@ What's New for OpenJPEG ! : changed + : added +October 26, 2010 +* [ben.boeckel] Install symlinks to versioned directory headers when using CMake ++ [ben.boeckel] Set the library version on jp3d when using CMake + October 25, 2010 * [ben.boeckel] Fix jp3d version diff --git a/jp3d/libjp3dvm/CMakeLists.txt b/jp3d/libjp3dvm/CMakeLists.txt index b2cf55c9..9cec396f 100644 --- a/jp3d/libjp3dvm/CMakeLists.txt +++ b/jp3d/libjp3dvm/CMakeLists.txt @@ -17,6 +17,10 @@ ENDIF(WIN32) # Create the library #ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) ADD_LIBRARY(${OPJ_PREFIX}openjp3dvm ${JP3DVM_SRCS}) +SET_TARGET_PROPERTIES(${OPJ_PREFIX}openjp3dvm + PROPERTIES + VERSION 1.3.0 + SOVERSION 1) # Install library INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm) @@ -25,3 +29,5 @@ INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm) INSTALL(FILES openjpeg.h DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3 RENAME openjpeg3d.h) +INSTALL(CODE + "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3/openjpeg3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d.h)") diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt index 20fb780c..647eda7c 100644 --- a/libopenjpeg/CMakeLists.txt +++ b/libopenjpeg/CMakeLists.txt @@ -50,3 +50,5 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME} INSTALL(FILES openjpeg.h DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} COMPONENT Headers ) +INSTALL(CODE + "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)") -- 2.30.2