[Bf-blender-cvs] [89525fae59e] master: Cleanup: CMake include paths

[Campbell Barton]

Commit: 89525fae59eaac8fe1d63a948b454ac9ce921f05
Author: Campbell Barton
Date:   Wed Oct 19 17:09:29 2022 +1100
Branches: master
https://developer.blender.org/rB89525fae59eaac8fe1d63a948b454ac9ce921f05

Cleanup: CMake include paths

Remove redundant separators & redundant references to parent paths.

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

M	intern/cycles/app/CMakeLists.txt
M	intern/ghost/CMakeLists.txt
M	source/blender/compositor/realtime_compositor/CMakeLists.txt
M	source/blender/io/stl/CMakeLists.txt
M	source/blender/io/wavefront_obj/CMakeLists.txt
M	source/blender/makesdna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/nodes/texture/CMakeLists.txt

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

diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 0988b1c0ac4..1c7a861ea93 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -43,7 +43,10 @@ else()
 endif()
 
 if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
-  list(APPEND INC_SYS ${Epoxy_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS})
+  list(APPEND INC_SYS
+    ${Epoxy_INCLUDE_DIRS}
+    ${SDL2_INCLUDE_DIRS}
+  )
   list(APPEND LIB ${Epoxy_LIBRARIES} ${SDL2_LIBRARIES})
 endif()
 
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 2f8ea1f9065..72621648608 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -268,7 +268,7 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
 
     if(WITH_GHOST_WAYLAND_DYNLOAD)
       list(APPEND INC_SYS
-        ../../intern/wayland_dynload/extern
+        ../wayland_dynload/extern
       )
       list(APPEND LIB
         bf_intern_wayland_dynload
diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt
index 90cbe0988ad..bab0b5385ec 100644
--- a/source/blender/compositor/realtime_compositor/CMakeLists.txt
+++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(INC
   .
-  ./algorithms
+  algorithms
   ../../blenkernel
   ../../blenlib
   ../../gpu
diff --git a/source/blender/io/stl/CMakeLists.txt b/source/blender/io/stl/CMakeLists.txt
index 3a21da5c579..f7eb933d198 100644
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(INC
   .
-  ./importer
+  importer
   ../common
   ../../blenkernel
   ../../blenlib
diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index f7958ef4ec6..bfbc715a45f 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -2,8 +2,8 @@
 
 set(INC
   .
-  ./exporter
-  ./importer
+  exporter
+  importer
   ../common
   ../../blenkernel
   ../../blenlib
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index 0d04d7df067..50fd51e88a1 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -116,8 +116,8 @@ blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 # -----------------------------------------------------------------------------
 # Build bf_dna_blenlib library
 set(INC
+  ..
   ../../blenlib
-  ../../makesdna
   ../../../../intern/atomic
   ../../../../intern/guardedalloc
 )
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 2b06daf34e3..f028b199098 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -200,7 +200,7 @@ set(INC
   ../../imbuf
   ../../makesdna
   ../../modifiers
-  ../../nodes/
+  ../../nodes
   ../../sequencer
   ../../simulation
   ../../windowmanager
diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt
index 77db71d4b1a..2d704ac2228 100644
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 set(INC
   .
-  ../
+  ..
   ../intern
   ../../editors/include
   ../../blenkernel