Fix cmake build, make sure custom zlib and custom libpng settings are…

… used
fhanau · Mar 18, 2020 · b748675 · b748675
1 parent ce388e7
commit b748675
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -52,6 +52,7 @@ add_subdirectory(lodepng EXCLUDE_FROM_ALL)
 add_subdirectory(miniz EXCLUDE_FROM_ALL)
 add_subdirectory(zlib EXCLUDE_FROM_ALL)
 add_subdirectory(zopfli EXCLUDE_FROM_ALL)
+file(COPY ${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ${CMAKE_SOURCE_DIR}/libpng/)
 add_subdirectory(optipng EXCLUDE_FROM_ALL)
 # Mozjpeg changes the install prefix if it thinks the current is defaulted
 set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)

diff --git a/src/optipng/CMakeLists.txt b/src/optipng/CMakeLists.txt
@@ -15,6 +15,12 @@ add_library(optipng
 
 add_library(optipng::optipng ALIAS optipng)
 
+#make sure that we are using custom zlib and custom libpng options
+set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE)
+set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../zlib/ CACHE FILEPATH "custom zlib directory" FORCE)
+add_compile_options(-Wno-macro-redefined)
+add_compile_definitions(PNG_USER_CONFIG)
+
 add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL)
 target_link_libraries(optipng
 	png_static)