diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-23 07:33:44 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-23 07:33:44 +0300 |
commit | 998ace3463c73a172c62418e438bddc93f78a22e (patch) | |
tree | e384f1236d2d9c9bd40f8f6050e8364852974642 /source/blender | |
parent | add1b6ab3c91d408635b311127224dd4cc33f1ab (diff) |
Cleanup: use lowercase function calls & macros in for CMake
This is already the case for most CMake usage.
Although some find modules are an exception to this, as they were
originally maintained externally they use some different conventions.
Also corrected bad indentation in: intern/cycles/CMakeLists.txt
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/tests/performance/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/io/collada/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/io/usd/CMakeLists.txt | 9 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/blenlib/tests/performance/CMakeLists.txt b/source/blender/blenlib/tests/performance/CMakeLists.txt index 2e4fcd4516c..722fd44733a 100644 --- a/source/blender/blenlib/tests/performance/CMakeLists.txt +++ b/source/blender/blenlib/tests/performance/CMakeLists.txt @@ -12,5 +12,5 @@ set(INC include_directories(${INC}) -BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib") -BLENDER_TEST_PERFORMANCE(BLI_task_performance "bf_blenlib") +blender_test_performance(BLI_ghash_performance "bf_blenlib") +blender_test_performance(BLI_task_performance "bf_blenlib") diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt index 3289a7c6e66..963a852a26a 100644 --- a/source/blender/io/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright 2006 Blender Foundation. All rights reserved. remove_strict_flags() -FIND_FILE(OPENCOLLADA_ANIMATION_CLIP +find_file(OPENCOLLADA_ANIMATION_CLIP NAMES COLLADAFWAnimationClip.h PATHS @@ -14,7 +14,7 @@ if(OPENCOLLADA_ANIMATION_CLIP) add_definitions(-DWITH_OPENCOLLADA_ANIMATION_CLIP) endif() -# In cmake version 3.21 and up, we can instead use the NO_CACHE option for +# In CMAKE version 3.21 and up, we can instead use the NO_CACHE option for # find_file so we don't need to clear it from the cache here. unset(OPENCOLLADA_ANIMATION_CLIP CACHE) diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 1205ae74e6f..4f1bc29cd0d 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -20,13 +20,14 @@ add_definitions(-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1) # add a USD_HAS_IMAGING define so code can dynamically detect this. # Cleanup of this variable is done at the end of the file since # test code further down uses it to add imaging tests. -FIND_FILE(USD_IMAGING_HEADERS +find_file( + USD_IMAGING_HEADERS NAMES capsuleAdapter.h PATHS - ${USD_INCLUDE_DIRS} + ${USD_INCLUDE_DIRS} PATH_SUFFIXES - pxr/usdImaging/usdImaging/ + pxr/usdImaging/usdImaging/ NO_DEFAULT_PATH ) @@ -162,7 +163,7 @@ if(WITH_GTESTS) tests/usd_tests_common.h ) if(USD_IMAGING_HEADERS) - LIST(APPEND TEST_SRC tests/usd_imaging_test.cc) + list(APPEND TEST_SRC tests/usd_imaging_test.cc) endif() set(TEST_INC |