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

openjpeg.pc.cmake rewrites wrong variables (issue 67)

This commit is contained in:
Rex Dieter 2011-03-30 18:44:40 +00:00
parent 70177d55b0
commit 1ab46eeff2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -143,7 +143,7 @@ ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# pkgconfig support # pkgconfig support
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc ) 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( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
INSTALL( CODE INSTALL( CODE
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")

12
libopenjpeg1.pc.cmake
View File

@ -1,12 +1,12 @@
prefix=${CMAKE_INSTALL_PREFIX} prefix=@CMAKE_INSTALL_PREFIX@
bindir=${OPENJPEG_INSTALL_BIN_DIR} bindir=@OPENJPEG_INSTALL_BIN_DIR@
datadir=${OPENJPEG_INSTALL_DATA_DIR} datadir=@OPENJPEG_INSTALL_DATA_DIR@
libdir=${OPENJPEG_INSTALL_LIB_DIR} libdir=@OPENJPEG_INSTALL_LIB_DIR@
includedir=${OPENJPEG_INSTALL_INCLUDE_DIR} includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
Name: openjpeg Name: openjpeg
Description: JPEG2000 files library Description: JPEG2000 files library
URL: http://www.openjpeg.org/ URL: http://www.openjpeg.org/
Version: ${OPENJPEG_VERSION} Version: @OPENJPEG_VERSION@
Libs: -L${libdir} -lopenjpeg Libs: -L${libdir} -lopenjpeg
Cflags: -I${includedir} Cflags: -I${includedir}