[Bf-blender-cvs] [c4ba0d15087] master: Fix Linux link error with pcre after recent changes, must use absolute path

Brecht Van Lommel noreply at git.blender.org
Thu Apr 2 22:06:36 CEST 2020


Commit: c4ba0d15087b5052bb557f94f93ac5f76c75da93
Author: Brecht Van Lommel
Date:   Thu Apr 2 22:05:03 2020 +0200
Branches: master
https://developer.blender.org/rBc4ba0d15087b5052bb557f94f93ac5f76c75da93

Fix Linux link error with pcre after recent changes, must use absolute path

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

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 d3444f41e37..0bf790b34e6 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -196,8 +196,9 @@ if(WITH_OPENCOLLADA)
   find_package_wrapper(OpenCOLLADA)
   if(OPENCOLLADA_FOUND)
     if(WITH_STATIC_LIBS)
-      # PCRE is bundled with OpenCollada.
-      set(PCRE_LIBRARIES pcre)
+      # PCRE is bundled with OpenCollada without headers, so can't use
+      # find_package reliably to detect it.
+      set(PCRE_LIBRARIES ${LIBDIR}/opencollada/lib/libpcre.a)
     else()
       find_package_wrapper(PCRE)
     endif()



More information about the Bf-blender-cvs mailing list