generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix assumptions that OPENJPEG_INSTALL_*_DIR aren't relative paths

Browse Source
This commit is contained in:
Rex Dieter 2012-02-28 17:44:49 +00:00
parent 8336ace29a
commit 23cab09e07
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -149,7 +149,7 @@ IF(UNIX)
${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig ) ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
\"libopenjpeg1.pc\" \"libopenjpeg1.pc\"
\"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
ENDIF(UNIX) ENDIF(UNIX)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

8
libopenjpeg1.pc.cmake
View File

@ -1,8 +1,8 @@
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
bindir=@OPENJPEG_INSTALL_BIN_DIR@ bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
datadir=@OPENJPEG_INSTALL_DATA_DIR@ datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
libdir=@OPENJPEG_INSTALL_LIB_DIR@ libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@ includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@
Name: openjpeg Name: openjpeg
Description: JPEG2000 files library Description: JPEG2000 files library