[1.5] rename opj_configh.cmake.in to opj_config.h.cmake.in and update CMakeLists...

diff --git a/CHANGES b/CHANGES
index e5af992bc9972593ed01fd26482047e169c4b099..0fd54141cbba796f146f84486996183e1c21c996 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 7, 2011
++ [mickael] rename opj_configh.cmake.in to opj_config.h.cmake.in and update CMakeLists.txt to be more clear
+
 October 6, 2011
 + [mickael] enhance html documentation generation with cmake and add a openjpeg mainpage to this doc
 + [mickael] enhance some new JPIP files with opj_config inclusion and using of opj_free/opj_calloc functions (credit to Julien Malik)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c1ef7d7ef59b999af1d4a82de7364344fc2be52..065e5b60d5878308c96e74ab80fa6e267c30d782 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,7 +218,7 @@ ENDIF (BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP)
 
 #-----------------------------------------------------------------------------
 # opj_config.h generation (2/2)
-CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in"
+CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
  "${OPENJPEG_BINARY_DIR}/opj_config.h"
  @ONLY
  )

diff --git a/opj_configh.cmake.in b/opj_config.h.cmake.in
similarity index 100%
rename from opj_configh.cmake.in
rename to opj_config.h.cmake.in