diff options
author | Campbell Barton <ideasman42@gmail.com> | 2022-01-06 05:54:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2022-01-06 05:54:54 +0300 |
commit | ed68e18c1c45aea07ec17c0b0dcdc109ad7492db (patch) | |
tree | ca23e6a1f0f69cef50d6bf8eacfefc867e09452a | |
parent | 2ee37e9031ecd824526e0bb466d9ecea43a12671 (diff) |
Cleanup: remove unnecessary slashes and quotes from paths in CMake
-rwxr-xr-x | build_files/cmake/cmake_consistency_check.py | 2 | ||||
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/nodes/composite/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/nodes/function/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/nodes/geometry/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/nodes/shader/CMakeLists.txt | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index c62e5fc0b59..d3dc9ff55ba 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -114,7 +114,7 @@ def is_c_header(filename: str) -> bool: def is_c(filename: str) -> bool: ext = splitext(filename)[1] - return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"}) + return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl", ".metal"}) def is_c_any(filename: str) -> bool: diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index ec282888ffa..7bf80939980 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -191,7 +191,7 @@ set(LIB if(WITH_BULLET) list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} - "../../../intern/rigidbody/" + ../../../intern/rigidbody ) if(NOT WITH_SYSTEM_BULLET) list(APPEND LIB diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index eea3adc440a..b0e0702f50a 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -553,8 +553,8 @@ if(WITH_GTESTS) tests/draw_testing.hh ) set(TEST_INC - "../../../intern/ghost/" - "../gpu/tests/" + ../../../intern/ghost + ../gpu/tests ) set(TEST_LIB ) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 4868096e594..9dd8b69be40 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -407,7 +407,7 @@ if(WITH_GTESTS) tests/gpu_testing.hh ) set(TEST_INC - "../../../intern/ghost/" + ../../../intern/ghost ) set(TEST_LIB diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 4d31cd3e4f5..56934596cc7 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -128,12 +128,12 @@ set(LIB if(WITH_BULLET) list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} - "../../../intern/rigidbody/" + ../../../intern/rigidbody ) if(NOT WITH_SYSTEM_BULLET) list(APPEND LIB extern_bullet - ) + ) endif() list(APPEND LIB diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index ca26e8bb70e..6818c08d6ed 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -20,7 +20,7 @@ set(INC . - ../ + .. ../intern ../../editors/include ../../blenkernel diff --git a/source/blender/nodes/function/CMakeLists.txt b/source/blender/nodes/function/CMakeLists.txt index 118a1fbffd1..0c3c6a34995 100644 --- a/source/blender/nodes/function/CMakeLists.txt +++ b/source/blender/nodes/function/CMakeLists.txt @@ -20,7 +20,7 @@ set(INC . - ../ + .. ../intern ../../blenkernel ../../blenlib @@ -53,7 +53,7 @@ set(SRC nodes/node_fn_slice_string.cc nodes/node_fn_string_length.cc nodes/node_fn_value_to_string.cc - + node_function_util.cc node_function_util.hh diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index e0c31fad97f..15e6544903f 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -18,7 +18,7 @@ set(INC . - ../ + .. ../intern ../../editors/include ../../blenkernel @@ -205,7 +205,7 @@ set(LIB if(WITH_BULLET) list(APPEND INC_SYS ${BULLET_INCLUDE_DIRS} - "../../../../intern/rigidbody/" + ../../../../intern/rigidbody ) if(NOT WITH_SYSTEM_BULLET) list(APPEND LIB diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt index 9878ebe3162..ae1a7115b95 100644 --- a/source/blender/nodes/shader/CMakeLists.txt +++ b/source/blender/nodes/shader/CMakeLists.txt @@ -20,7 +20,7 @@ set(INC . - ../ + .. ../intern ../../blenkernel ../../blenlib |