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

[trunk] correct missing variable in openjpeg config file

This commit is contained in:
Mickael Savinaud 2013-03-13 10:18:04 +00:00
parent a8c33ae219
commit 92b1e038c1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -182,10 +182,11 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# opj_config.h generation # opj_config.h generation
include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
CHECK_INCLUDE_FILE("stdint.h" OPJ_HAVE_STDINT_H) CHECK_INCLUDE_FILE("stdint.h" OPJ_HAVE_STDINT_H)
CHECK_INCLUDE_FILE("inttypes.h" OPJ_HAVE_INTTYPES_H)
CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H)
CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H) CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H) CHECK_INCLUDE_FILE("stdio.h" HAVE_STDIO_H)
CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H) CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)

4
src/lib/openjp2/opj_config.h.cmake.in
View File

@ -1,10 +1,10 @@
/* create config.h for CMake */ /* create config.h for CMake */
#cmakedefine OPJ_HAVE_STDINT_H @OPJ_HAVE_STDINT_H@ #cmakedefine OPJ_HAVE_STDINT_H @OPJ_HAVE_STDINT_H@
#cmakedefine OPJ_HAVE_INTTYPES_H @OPJ_HAVE_INTTYPES_H@
#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@" #define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
/* Not used by openjp2*/ /* Not used by openjp2*/
/*#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@*/
/*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/ /*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/
/*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/ /*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/
/*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/ /*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/

2
src/lib/openjp2/opj_inttypes.h
View File

@ -27,7 +27,7 @@
#define OPJ_INTTYPES_H #define OPJ_INTTYPES_H
#include "opj_config.h" #include "opj_config.h"
#ifdef HAVE_INTTYPES_H #ifdef OPJ_HAVE_INTTYPES_H
#include <inttypes.h> #include <inttypes.h>
#else #else
#if defined(_WIN32) #if defined(_WIN32)