Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-04-02 23:05:03 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-04-02 23:05:03 +0300
commitc4ba0d15087b5052bb557f94f93ac5f76c75da93 (patch)
tree4e34c8e2c95617d4966e4b048610560aa8bbda07 /build_files
parent75f6e6b39e41dd453b4802eb3bae397a3be0d48f (diff)
Fix Linux link error with pcre after recent changes, must use absolute path
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/platform/platform_unix.cmake5
1 files changed, 3 insertions, 2 deletions
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()