diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-01 10:39:39 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-01 10:39:39 +0000 |
| commit | bf37be46b8e934e2df3a4cb3e4736fc39f43e52e (patch) | |
| tree | 6563f836143608e33d9760ccc10163b0a2c007e8 | |
| parent | 4466c31fc2ff0016b751c0607e99e8e1f2061921 (diff) | |
[trunk] rename PACKAGE_VERSION to OPJ_PACKAGE_VERSION
This prevent conflicts with TIFF package which also defines PACKAGE_VERSION
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/lib/openjp2/openjpeg.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/opj_config.h.cmake.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db3c5eff..dfa4beba 100644 --- 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 8d879f21..c54b1a50 100644 --- 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 b57adb74..e5ac38e4 100644 --- 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@ |