[Bf-blender-cvs] [ba2072524bb] blender-v3.4-release: Fix CMake error when pkg-config is not installed

Brecht Van Lommel noreply at git.blender.org
Fri Nov 11 18:23:32 CET 2022


Commit: ba2072524bbf06068bec5c12e185a222b4d57f76
Author: Brecht Van Lommel
Date:   Fri Nov 11 17:55:07 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rBba2072524bbf06068bec5c12e185a222b4d57f76

Fix CMake error when pkg-config is not installed

Don't assume xxx_FOUND variables are defined.

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 73883376060..824c587c86e 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1240,7 +1240,7 @@ endmacro()
 
 macro(set_and_warn_library_found
   _library_name _library_found _setting)
-  if(NOT ${${_library_found}} AND ${${_setting}})
+  if(((NOT ${_library_found}) OR (NOT ${${_library_found}})) AND ${${_setting}})
     if(WITH_STRICT_BUILD_OPTIONS)
       message(SEND_ERROR "${_library_name} required but not found")
     else()



More information about the Bf-blender-cvs mailing list