[trunk] rename PACKAGE_VERSION to OPJ_PACKAGE_VERSION

This prevent conflicts with TIFF package which also defines PACKAGE_VERSION

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db3c5eff366b0fb1915aaafd6b539a067e26a32a..dfa4bebaed0c4d8fff59c88602abce6ca8a4c8c2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,6 +165,9 @@ CHECK_INCLUDE_FILE("string.h"       HAVE_STRING_H)
 CHECK_INCLUDE_FILE("sys/stat.h"     HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/types.h"    HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE("unistd.h"       HAVE_UNISTD_H)
+# ssize_t
+include(CheckTypeSize)
+CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
 
 # Enable Large file support
 include(TestLargeFiles)
@@ -199,9 +202,6 @@ if(BUILD_CODEC OR BUILD_MJ2)
 endif ()
 add_subdirectory(wrapping)
 
-include(CheckTypeSize)
-CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
-
 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
 option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)

diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c
index 8d879f213383260ec8e2c0bee67711d387b040be..c54b1a501be3804a41beb43ce1aa08bf59c314f4 100644 (file)
--- a/src/lib/openjp2/openjpeg.c
+++ b/src/lib/openjp2/openjpeg.c
@@ -266,7 +266,7 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
 /* ---------------------------------------------------------------------- */
 
 const char* OPJ_CALLCONV opj_version(void) {
-    return PACKAGE_VERSION;
+    return OPJ_PACKAGE_VERSION;
 }
 
 /* ---------------------------------------------------------------------- */

diff --git a/src/lib/openjp2/opj_config.h.cmake.in b/src/lib/openjp2/opj_config.h.cmake.in
index b57adb748d8cef7e14e61fc1c08b48795e49b3ed..e5ac38e4aef643067f97f18b007e5b821607cae6 100644 (file)
--- a/src/lib/openjp2/opj_config.h.cmake.in
+++ b/src/lib/openjp2/opj_config.h.cmake.in
@@ -1,5 +1,5 @@
 /* create config.h for CMake */
-#define PACKAGE_VERSION "@PACKAGE_VERSION@"
+#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
 
 #cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
 #cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@