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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bc46e236c0c45760c0cb48d39ad9c713812903b..28b2c46771ed03672b093bde519642284427cc3b 100644 (file)
--- 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 2caa0fa3093e683f705a43a482d7ac78c5c84441..9da820b55b1e92fa8df2df06e930b55e2ca6505c 100644 (file)
--- 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}