[Bf-blender-cvs] [75f6e6b39e4] master: Fix link error on Linux buildbot with libxml2
Brecht Van Lommel
noreply at git.blender.org
Thu Apr 2 18:55:13 CEST 2020
Commit: 75f6e6b39e41dd453b4802eb3bae397a3be0d48f
Author: Brecht Van Lommel
Date: Thu Apr 2 18:52:22 2020 +0200
Branches: master
https://developer.blender.org/rB75f6e6b39e41dd453b4802eb3bae397a3be0d48f
Fix link error on Linux buildbot with libxml2
On macOS this is part of the collada folder, but for Linux xml2 is in its own
folder for precompiled libraries.
===================================================================
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 3f73916daf3..d3444f41e37 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -196,13 +196,12 @@ if(WITH_OPENCOLLADA)
find_package_wrapper(OpenCOLLADA)
if(OPENCOLLADA_FOUND)
if(WITH_STATIC_LIBS)
- # PCRE and XML2 are bundled with OpenCollada.
+ # PCRE is bundled with OpenCollada.
set(PCRE_LIBRARIES pcre)
- set(XML2_LIBRARIES xml2)
else()
- find_package_wrapper(XML2)
find_package_wrapper(PCRE)
endif()
+ find_package_wrapper(XML2)
else()
set(WITH_OPENCOLLADA OFF)
endif()
More information about the Bf-blender-cvs
mailing list