[Bf-blender-cvs] [9676dce3171] master: Cleanup: CMake indentation
Campbell Barton
noreply at git.blender.org
Thu Jan 19 07:31:49 CET 2023
Commit: 9676dce3171eb57a0f27512a07f09766959bb656
Author: Campbell Barton
Date: Thu Jan 19 17:07:17 2023 +1100
Branches: master
https://developer.blender.org/rB9676dce3171eb57a0f27512a07f09766959bb656
Cleanup: CMake indentation
===================================================================
M build_files/build_environment/cmake/usd.cmake
M build_files/cmake/macros.cmake
M intern/cycles/kernel/CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index 98c7931808f..04000951166 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -29,7 +29,7 @@ elseif(UNIX)
set(USD_PLATFORM_FLAGS
-DPYTHON_INCLUDE_DIR=${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/
-DPYTHON_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT}
- )
+ )
if(APPLE)
set(USD_SHARED_LINKER_FLAGS "-Xlinker -undefined -Xlinker dynamic_lookup")
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 9965f892395..1b440c7aaed 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1115,7 +1115,7 @@ function(find_python_package
# endif()
# Not set, so initialize.
else()
- string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
+ string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
list(GET _PY_VER_SPLIT 0 _PY_VER_MAJOR)
# re-cache
@@ -1275,7 +1275,7 @@ macro(add_bundled_libraries library_dir)
list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir})
unset(_all_library_versions)
unset(_library_dir)
- endif()
+ endif()
endmacro()
macro(windows_install_shared_manifest)
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 3ae468efd1f..78bd71988c0 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -732,25 +732,25 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
endif()
# SYCL_CPP_FLAGS is a variable that the user can set to pass extra compiler options
set(sycl_compiler_flags
- ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_KERNEL_DEVICE_ONEAPI}
- -fsycl
- -fsycl-unnamed-lambda
- -fdelayed-template-parsing
- -mllvm -inlinedefault-threshold=250
- -mllvm -inlinehint-threshold=350
- -fsycl-device-code-split=per_kernel
- -fsycl-max-parallel-link-jobs=${SYCL_OFFLINE_COMPILER_PARALLEL_JOBS}
- -shared
- -DWITH_ONEAPI
- -ffast-math
- -DNDEBUG
- -O2
- -o ${cycles_kernel_oneapi_lib}
- -I${CMAKE_CURRENT_SOURCE_DIR}/..
- ${SYCL_CPP_FLAGS}
- )
-
- if (WITH_CYCLES_ONEAPI_HOST_TASK_EXECUTION)
+ ${CMAKE_CURRENT_SOURCE_DIR}/${SRC_KERNEL_DEVICE_ONEAPI}
+ -fsycl
+ -fsycl-unnamed-lambda
+ -fdelayed-template-parsing
+ -mllvm -inlinedefault-threshold=250
+ -mllvm -inlinehint-threshold=350
+ -fsycl-device-code-split=per_kernel
+ -fsycl-max-parallel-link-jobs=${SYCL_OFFLINE_COMPILER_PARALLEL_JOBS}
+ -shared
+ -DWITH_ONEAPI
+ -ffast-math
+ -DNDEBUG
+ -O2
+ -o ${cycles_kernel_oneapi_lib}
+ -I${CMAKE_CURRENT_SOURCE_DIR}/..
+ ${SYCL_CPP_FLAGS}
+ )
+
+ if(WITH_CYCLES_ONEAPI_HOST_TASK_EXECUTION)
list(APPEND sycl_compiler_flags -DWITH_ONEAPI_SYCL_HOST_TASK)
endif()
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 1cf908b4821..fa3ab5d3b86 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -617,16 +617,16 @@ if(UNIX AND NOT APPLE)
# Remove from old location, so existing builds don't start with software
# OpenGL now that the lib/ folder is used for other libraries.
install(
- CODE
- "file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1.5.0)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1.3.1)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0)\n
- file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
+ CODE "\
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1.5.0)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1.3.1)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0)\n
+ file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
"
)
endif()
@@ -1071,7 +1071,7 @@ elseif(WIN32)
)
if(EXISTS ${LIBDIR}/openimageio/lib/python${PYTHON_VERSION}/site-packages) #this will only exist for 3.5+
- install(
+ install(
DIRECTORY ${LIBDIR}/openimageio/lib/python${PYTHON_VERSION}/site-packages/
DESTINATION ${TARGETDIR_VER}/python/lib/site-packages/
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
More information about the Bf-blender-cvs
mailing list