cleanup on cmake/get-libpng

fifengine · Jan 22, 2019 · 702cbcb · 702cbcb
1 parent 170a8ce
commit 702cbcb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/cmake/get-libpng.cmake b/cmake/get-libpng.cmake
@@ -12,14 +12,13 @@ set(LIBPNG_VERSION "1.6.36")
 set(LIBPNG_CMAKE_ARGS ${COMMON_CMAKE_ARGS}
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    -DCMAKE_CONFIGURATION_TYPES=Release
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
     -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-    -DBUILD_SHARED_LIBS=FALSE
-    -DPNG_SHARED=off
+    -DBUILD_SHARED_LIBS=TRUE
+    -DPNG_SHARED=on
     -DPNG_STATIC=on
-    -DPNG_TESTS=off
+    -DPNG_TESTS=on
+    -DPNG_DEBUG=off
     -DZLIB_LIBRARY:FILEPATH=${DEPENDENCY_INSTALL_DIR}/lib/zlib.lib
     -DZLIB_INCLUDE_DIR:PATH=${DEPENDENCY_INSTALL_DIR}/include    
 )
@@ -33,13 +32,5 @@ ExternalProject_Add(
   URL                 https://github.com/glennrp/libpng/archive/v${LIBPNG_VERSION}.zip
   URL_MD5             72c2bebf31d9fbd59cfc24d8c5ce49df
   INSTALL_DIR         ${DEPENDENCY_INSTALL_DIR}
-  CONFIGURE_COMMAND   ${CMAKE_COMMAND} ${DEPENDENCY_EXTRACT_DIR}/src/libpng 
-         -G ${CMAKE_GENERATOR} 
-         -DZLIB_INCLUDE_DIR:PATH=${DEPENDENCY_INSTALL_DIR}/include
-         -DZLIB_LIBRARY:FILEPATH=${DEPENDENCY_INSTALL_DIR}/lib/zlib.lib
-         -DCMAKE_INSTALL_PREFIX=${DEPENDENCY_INSTALL_DIR}
-  BUILD_COMMAND       ${CMAKE_COMMAND} --build ${DEPENDENCY_EXTRACT_DIR}/src/libpng-build --config Release --target INSTALL
-  #BUILD_COMMAND       msbuild libpng.sln /target:INSTALL /p:Platform=Win32 /p:Configuration=Release
-  #INSTALL_COMMAND     msbuild libpng.sln /build Release /project INSTALL
-  #CMAKE_ARGS   ${LIBPNG_CMAKE_ARGS}     
+  CMAKE_ARGS          ${LIBPNG_CMAKE_ARGS}     
 )
diff --git a/cmake/get-zlib.cmake b/cmake/get-zlib.cmake
@@ -15,6 +15,7 @@ set(ZLIB_CMAKE_ARGS
       -DCMAKE_INSTALL_PREFIX=${DEPENDENCY_INSTALL_DIR}
       -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
       -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+      -DSKIP_INSTALL_FILES=ON
 )
 
 ExternalProject_Add(