walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Installation fixes when using CMake

This commit is contained in:
Ben Boeckel 2010-10-26 16:46:01 +00:00
parent f35d25c674
commit af32de46a2
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -5,6 +5,10 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : 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 October 25, 2010
* [ben.boeckel] Fix jp3d version * [ben.boeckel] Fix jp3d version

6
jp3d/libjp3dvm/CMakeLists.txt
View File

@ -17,6 +17,10 @@ ENDIF(WIN32)
# Create the library # Create the library
#ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) #ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
ADD_LIBRARY(${OPJ_PREFIX}openjp3dvm ${JP3DVM_SRCS}) ADD_LIBRARY(${OPJ_PREFIX}openjp3dvm ${JP3DVM_SRCS})
SET_TARGET_PROPERTIES(${OPJ_PREFIX}openjp3dvm
PROPERTIES
VERSION 1.3.0
SOVERSION 1)
# Install library # Install library
INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm) INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm)
@ -25,3 +29,5 @@ INSTALL_TARGETS(/lib/ ${OPJ_PREFIX}openjp3dvm)
INSTALL(FILES openjpeg.h INSTALL(FILES openjpeg.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3 DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3
RENAME openjpeg3d.h) 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)")

2
libopenjpeg/CMakeLists.txt
View File

@ -50,3 +50,5 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
INSTALL(FILES openjpeg.h INSTALL(FILES openjpeg.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} COMPONENT Headers 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)")