fix android compile error

PaddlePaddle · Feb 7, 2023 · 6307986 · 6307986
1 parent 526be5b
commit 6307986
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/FCVFindDependencies.cmake b/cmake/FCVFindDependencies.cmake
@@ -11,8 +11,8 @@ if(BUILD_FCV_MEDIA_IO)
 
         # Build with libpng.
         if(WITH_LIB_PNG)
-            include(external/zlib)
             include(external/libpng)
+            include(external/zlib)
             add_dependencies(libpng zlib)
             add_definitions(-DWITH_LIB_PNG)
         endif(WITH_LIB_PNG)

diff --git a/cmake/external/libpng.cmake b/cmake/external/libpng.cmake
@@ -16,7 +16,7 @@ list(APPEND LIBPNG_CMAKE_ARGS
         -DPNG_BUILD_ZLIB=ON)
 
 if(NOT APPLE)
-    list(APPEND LIBJPEG_CMAKE_ARGS
+    list(APPEND LIBPNG_CMAKE_ARGS
         -DCMAKE_CXX_FLAGS:STRING="-fPIC"
         -DCMAKE_CXX_FLAGS:STRING="-w"
         -DCMAKE_C_FLAGS:STRING="-fPIC"