[Bf-blender-cvs] [539aef6e353] greasepencil-object: GPencil: Fix pugixml library linking on linux
Falk David
noreply at git.blender.org
Tue Jul 28 21:06:56 CEST 2020
Commit: 539aef6e3534c151a2fa0a652d8967f5a5fda351
Author: Falk David
Date: Tue Jul 28 21:05:03 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB539aef6e3534c151a2fa0a652d8967f5a5fda351
GPencil: Fix pugixml library linking on linux
===================================================================
M build_files/cmake/platform/platform_unix.cmake
M source/blender/io/gpencil/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 96244b65f21..7390dc69569 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -334,7 +334,7 @@ if(WITH_OPENIMAGEIO)
find_package_wrapper(PugiXML)
else()
set(PUGIXML_INCLUDE_DIR "${OPENIMAGEIO_INCLUDE_DIR/OpenImageIO}")
- set(PUGIXML_LIBRARIES "")
+ #set(PUGIXML_LIBRARIES "")
endif()
set(OPENIMAGEIO_LIBRARIES
diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt
index 4874b7fbc12..a31f30ac590 100644
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -54,7 +54,7 @@ set(LIB
bf_blenlib
bf_io_common
- #${PUGIXML_LIBRARIES}
+ ${PUGIXML_LIBRARIES}
)
list(APPEND LIB
More information about the Bf-blender-cvs
mailing list