[Bf-blender-cvs] [5321e844d3f] master: CMake/Linux: Add libharu to platform_linux.cmake
Ankit Meel
noreply at git.blender.org
Tue Feb 9 14:40:36 CET 2021
Commit: 5321e844d3fa8a3421df1c9d7aedc52e22ca5264
Author: Ankit Meel
Date: Tue Feb 9 14:36:11 2021 +0100
Branches: master
https://developer.blender.org/rB5321e844d3fa8a3421df1c9d7aedc52e22ca5264
CMake/Linux: Add libharu to platform_linux.cmake
Since GPencil changes depending on libharu may be committed to master
before SVN libraries for all platforms are in place, avoid build issues.
Extension of D9928.
Reviewed By: sybren
Differential Revision: https://developer.blender.org/D10280
===================================================================
M build_files/cmake/platform/platform_unix.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 7ded075e8e3..fed70c5b8b2 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -470,6 +470,14 @@ if(WITH_POTRACE)
endif()
endif()
+if(WITH_HARU)
+ find_package_wrapper(Haru)
+ if(NOT HARU_FOUND)
+ message(WARNING "Haru not found, disabling WITH_HARU")
+ set(WITH_HARU OFF)
+ endif()
+endif()
+
if(EXISTS ${LIBDIR})
without_system_libs_end()
endif()
More information about the Bf-blender-cvs
mailing list