walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] use autotools convention where #ifdef BLA, should be provided by #define BLA 1. This is to cope with pseudo autotools generated tif header.

This commit is contained in:
Mathieu Malaterre 2012-03-19 13:10:46 +00:00
parent ff72dd8d2c
commit 8890539f47
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libopenjpeg/openjpeg.c
View File

@ -220,7 +220,7 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
const char* OPJ_CALLCONV opj_version(void) { const char* OPJ_CALLCONV opj_version(void) {
return PACKAGE_VERSION; return OPJ_PACKAGE_VERSION;
} }

33
opj_config.h.cmake.in
View File

@ -1,29 +1,24 @@
/* create config.h for CMake */ /* create config.h for CMake */
#define PACKAGE_VERSION "@PACKAGE_VERSION@" #define PACKAGE_VERSION "@PACKAGE_VERSION@"
#cmakedefine HAVE_INTTYPES_H #cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
#cmakedefine HAVE_MEMORY_H #cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@
#cmakedefine HAVE_STDINT_H #cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@
#cmakedefine HAVE_STDLIB_H #cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@
#cmakedefine HAVE_STRINGS_H #cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@
#cmakedefine HAVE_STRING_H #cmakedefine HAVE_STRING_H @HAVE_STRING_H@
#cmakedefine HAVE_SYS_STAT_H #cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@
#cmakedefine HAVE_SYS_TYPES_H #cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@
#ifndef HAVE_UNISTD_H #cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@
#cmakedefine HAVE_UNISTD_H #cmakedefine HAVE_LIBPNG @HAVE_LIBPNG@
#endif /* HAVE_UNISTD_H */ #cmakedefine HAVE_PNG_H @HAVE_PNG_H@
#cmakedefine HAVE_LIBPNG #cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@
#cmakedefine HAVE_PNG_H #cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@
#cmakedefine HAVE_LIBTIFF
#cmakedefine HAVE_TIFF_H
#cmakedefine _LARGEFILE_SOURCE #cmakedefine _LARGEFILE_SOURCE
#cmakedefine _LARGE_FILES #cmakedefine _LARGE_FILES
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@ #cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
#ifndef HAVE_FSEEKO #cmakedefine HAVE_FSEEKO @HAVE_FSEEKO@
#cmakedefine HAVE_FSEEKO
#endif /* HAVE_FSEEKO */
#cmakedefine HAVE_LIBLCMS1 #cmakedefine HAVE_LIBLCMS1
#cmakedefine HAVE_LIBLCMS2 #cmakedefine HAVE_LIBLCMS2

2
thirdparty/libtiff/tif_config.h.cmake.in vendored
View File

@ -238,7 +238,7 @@
#undef PACKAGE_URL #undef PACKAGE_URL
/* Define to the version of this package. */ /* Define to the version of this package. */
#cmakedefine PACKAGE_VERSION #cmakedefine PACKAGE_VERSION @PACKAGE_VERSION@
/* Support Macintosh PackBits algorithm */ /* Support Macintosh PackBits algorithm */
#define PACKBITS_SUPPORT 1 #define PACKBITS_SUPPORT 1