[trunk] rename PACKAGE_VERSION to OPJ_PACKAGE_VERSION

This prevent conflicts with TIFF package which also defines PACKAGE_VERSION

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)

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;
 }
 
 /* ---------------------------------------------------------------------- */

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@