diff options
| author | Rex Dieter <rdieter@gmail.com> | 2011-03-30 18:44:40 +0000 |
|---|---|---|
| committer | Rex Dieter <rdieter@gmail.com> | 2011-03-30 18:44:40 +0000 |
| commit | 1ab46eeff2e772b3e07a239f105dfcae2e170147 (patch) | |
| tree | 9df8a744257c8166af1f61453e5d9b31257ae88e | |
| parent | 70177d55b0f5233a37308dad8c551baeefd1a972 (diff) | |
openjpeg.pc.cmake rewrites wrong variables (issue 67)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libopenjpeg1.pc.cmake | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bc46e23..28b2c467 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,7 @@ ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in) #----------------------------------------------------------------------------- # 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( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") diff --git a/libopenjpeg1.pc.cmake b/libopenjpeg1.pc.cmake index 2caa0fa3..9da820b5 100644 --- a/libopenjpeg1.pc.cmake +++ b/libopenjpeg1.pc.cmake @@ -1,12 +1,12 @@ -prefix=${CMAKE_INSTALL_PREFIX} -bindir=${OPENJPEG_INSTALL_BIN_DIR} -datadir=${OPENJPEG_INSTALL_DATA_DIR} -libdir=${OPENJPEG_INSTALL_LIB_DIR} -includedir=${OPENJPEG_INSTALL_INCLUDE_DIR} +prefix=@CMAKE_INSTALL_PREFIX@ +bindir=@OPENJPEG_INSTALL_BIN_DIR@ +datadir=@OPENJPEG_INSTALL_DATA_DIR@ +libdir=@OPENJPEG_INSTALL_LIB_DIR@ +includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ Name: openjpeg Description: JPEG2000 files library URL: http://www.openjpeg.org/ -Version: ${OPENJPEG_VERSION} +Version: @OPENJPEG_VERSION@ Libs: -L${libdir} -lopenjpeg Cflags: -I${includedir} |