[Bf-blender-cvs] [bba42342055] temp-precompiled-linux: CMake: Fix libpng library path

Nathan Craddock noreply at git.blender.org
Tue Feb 4 22:45:21 CET 2020


Commit: bba423420553dd42aea9388dfb565f8c8ecc2609
Author: Nathan Craddock
Date:   Tue Feb 4 14:42:28 2020 -0700
Branches: temp-precompiled-linux
https://developer.blender.org/rBbba423420553dd42aea9388dfb565f8c8ecc2609

CMake: Fix libpng library path

The path in the precompiled libraries is libpng16.a rather than
libpng.a.

===================================================================

M	build_files/cmake/platform/platform_unix_precompiled.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_unix_precompiled.cmake b/build_files/cmake/platform/platform_unix_precompiled.cmake
index dad8268ab1d..97d8e671994 100644
--- a/build_files/cmake/platform/platform_unix_precompiled.cmake
+++ b/build_files/cmake/platform/platform_unix_precompiled.cmake
@@ -34,7 +34,7 @@ set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
 set(PNG_FOUND TRUE)
 set(PNG_ROOT ${LIBDIR}/png)
 set(PNG_INCLUDE_DIR ${PNG_ROOT}/include ${ZLIB_INCLUDE_DIR})
-set(PNG_LIBRARY ${PNG_ROOT}/lib/libpng.a ${ZLIB_LIBRARY})
+set(PNG_LIBRARY ${PNG_ROOT}/lib/libpng16.a ${ZLIB_LIBRARY})
 set(PNG_INCLUDE_DIRS ${PNG_INCLUDE_DIR})
 set(PNG_LIBRARIES ${PNG_LIBRARY})



More information about the Bf-blender-cvs mailing list