update libpng to from 1.6.17 to 1.6.21

[openjpeg.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1856a0b33f3fbafce74466dabd06ded249a0d7e9..3326b54e5cc24a2c10069f5c146d958dca00938b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,14 +227,16 @@ OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
 
 # Allocating Aligned Memory Blocks
 include(CheckIncludeFiles)
-check_include_files(malloc.h HAVE_MALLOC_H)
+check_include_files(malloc.h OPJ_HAVE_MALLOC_H)
 include(CheckSymbolExists)
 # _aligned_alloc https://msdn.microsoft.com/en-us/library/8z34s9c6.aspx
-check_symbol_exists(_aligned_malloc malloc.h HAVE__ALIGNED_MALLOC)
-# posix_memalign
-check_symbol_exists(posix_memalign stdlib.h HAVE_POSIX_MEMALIGN)
+check_symbol_exists(_aligned_malloc malloc.h OPJ_HAVE__ALIGNED_MALLOC)
+# posix_memalign (needs _POSIX_C_SOURCE >= 200112L on Linux)
+set(CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200112L)
+check_symbol_exists(posix_memalign stdlib.h OPJ_HAVE_POSIX_MEMALIGN)
+unset(CMAKE_REQUIRED_DEFINITIONS)
 # memalign (obsolete)
-check_symbol_exists(memalign malloc.h HAVE_MEMALIGN)
+check_symbol_exists(memalign malloc.h OPJ_HAVE_MEMALIGN)
 #-----------------------------------------------------------------------------
 # Build Library
 if(BUILD_JPIP_SERVER)