[trunk] correct missing variable in openjpeg config file
This commit is contained in:
parent
a8c33ae219
commit
92b1e038c1
@ -182,10 +182,11 @@ endif()
|
||||
#-----------------------------------------------------------------------------
|
||||
# opj_config.h generation
|
||||
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("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("stdio.h" HAVE_STDIO_H)
|
||||
CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
|
||||
|
@ -1,10 +1,10 @@
|
||||
/* 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@"
|
||||
|
||||
/* Not used by openjp2*/
|
||||
/*#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@*/
|
||||
/*#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@*/
|
||||
/*#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@*/
|
||||
/*#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@*/
|
||||
|
@ -27,7 +27,7 @@
|
||||
#define OPJ_INTTYPES_H
|
||||
|
||||
#include "opj_config.h"
|
||||
#ifdef HAVE_INTTYPES_H
|
||||
#ifdef OPJ_HAVE_INTTYPES_H
|
||||
#include <inttypes.h>
|
||||
#else
|
||||
#if defined(_WIN32)
|
||||
|
Loading…
Reference in New Issue
Block a user