bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: CMake formatting

Browse Source
This commit is contained in:
Campbell Barton 2023-10-07 19:46:38 +11:00
parent d2d654407f
commit 149d80946e
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -803,7 +803,7 @@ if(NOT APPLE)
WITH_VULKAN_BACKEND
WITH_VULKAN_GUARDEDALLOC
)
if (NOT WITH_EXPERIMENTAL_FEATURES)
if(NOT WITH_EXPERIMENTAL_FEATURES)
set(WITH_VULKAN_BACKEND OFF)
endif()
endif()
@ -950,7 +950,10 @@ Include the files needed for debugging python scripts with visual studio 2017+."
option(WITH_WINDOWS_SCCACHE "Use sccache to speed up builds (Ninja builder only)" OFF)
mark_as_advanced(WITH_WINDOWS_SCCACHE)
option(WITH_WINDOWS_RELEASE_PDB "Generate a pdb file for client side stacktraces for release builds" ON)
option(WITH_WINDOWS_RELEASE_PDB "\
Generate a pdb file for client side stacktraces for release builds"
ON
)
mark_as_advanced(WITH_WINDOWS_RELEASE_PDB)
option(WITH_WINDOWS_RELEASE_STRIPPED_PDB "Use a stripped PDB file for release builds" ON)

2
build_files/cmake/Modules/FindWebP.cmake
View File

@ -57,7 +57,7 @@ foreach(COMPONENT ${_webp_FIND_COMPONENTS})
PATH_SUFFIXES
lib64 lib lib/static
)
if (WEBP_${UPPERCOMPONENT}_LIBRARY)
if(WEBP_${UPPERCOMPONENT}_LIBRARY)
list(APPEND _webp_LIBRARIES "${WEBP_${UPPERCOMPONENT}_LIBRARY}")
endif()
endforeach()

4
build_files/cmake/macros.cmake
View File

@ -1124,7 +1124,7 @@ function(data_to_c
set(optional_args "")
foreach(f ${ARGN})
if (f STREQUAL "STRIP_LEADING_C_COMMENTS")
if(f STREQUAL "STRIP_LEADING_C_COMMENTS")
set(optional_args "--options=strip_leading_c_comments")
else()
message(FATAL_ERROR "Unknown optional argument ${f} to \"data_to_c\"")
@ -1161,7 +1161,7 @@ function(data_to_c_simple
set(optional_args "")
foreach(f ${ARGN})
if (f STREQUAL "STRIP_LEADING_C_COMMENTS")
if(f STREQUAL "STRIP_LEADING_C_COMMENTS")
set(optional_args "--options=strip_leading_c_comments")
else()
message(FATAL_ERROR "Unknown optional argument ${f} to \"data_to_c_simple\"")

2
intern/cycles/cmake/macros.cmake
View File

@ -128,7 +128,7 @@ macro(cycles_external_libraries_append libraries)
if(WITH_PATH_GUIDING)
list(APPEND ${libraries} ${OPENPGL_LIBRARIES})
endif()
if (WITH_WEBP)
if(WITH_WEBP)
list(APPEND ${libraries} ${WEBP_LIBRARIES})
endif()
if(UNIX AND NOT APPLE)

2
intern/cycles/kernel/CMakeLists.txt
View File

@ -43,7 +43,7 @@ set(SRC_KERNEL_DEVICE_OPTIX
if(WITH_CYCLES_OSL)
math(EXPR OSL_LIBRARY_VERSION_CODE "${OSL_LIBRARY_VERSION_MAJOR} * 10000 + ${OSL_LIBRARY_VERSION_MINOR} * 100 + ${OSL_LIBRARY_VERSION_PATCH}")
if (OSL_LIBRARY_VERSION_CODE GREATER_EQUAL 11300)
if(OSL_LIBRARY_VERSION_CODE GREATER_EQUAL 11300)
set(SRC_KERNEL_DEVICE_OPTIX
${SRC_KERNEL_DEVICE_OPTIX}
osl/services_optix.cu