[Bf-blender-cvs] [d0d0d9d7c65] master: Fix broken compilation after recent GPencil commit.

Bastien Montagne noreply at git.blender.org
Wed Mar 24 17:03:39 CET 2021


Commit: d0d0d9d7c659acba779dced73f003348dc173a9b
Author: Bastien Montagne
Date:   Wed Mar 24 17:01:19 2021 +0100
Branches: master
https://developer.blender.org/rBd0d0d9d7c659acba779dced73f003348dc173a9b

Fix broken compilation after recent GPencil commit.

rBa8a92cd15a52 was adding external libraries includes to `INC`, which is
reserved to internal project includes.

`INC` does not allow duplicates, and when using system libs both PugiXML
and Haru headers are under the same path.

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

M	source/blender/io/gpencil/CMakeLists.txt

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

diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt
index f394075cb9a..11c9affbe5a 100644
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -68,7 +68,7 @@ if(WITH_PUGIXML)
     intern/gpencil_io_export_svg.h
     intern/gpencil_io_export_svg.cc
   )
-  list(APPEND INC
+  list(APPEND INC_SYS
     ${PUGIXML_INCLUDE_DIR}
   )
   list(APPEND LIB
@@ -82,7 +82,7 @@ if(WITH_HARU)
     intern/gpencil_io_export_pdf.h
     intern/gpencil_io_export_pdf.cc
   )
-  list(APPEND INC
+  list(APPEND INC_SYS
     ${HARU_INCLUDE_DIRS}
   )
   list(APPEND LIB



More information about the Bf-blender-cvs mailing list