diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 28 | ||||
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 12 | ||||
-rw-r--r-- | intern/cycles/scene/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/opensubdiv/CMakeLists.txt | 10 |
5 files changed, 27 insertions, 27 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 89dad8ed36e..8adb032ad9e 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -36,7 +36,7 @@ if(WITH_CYCLES_NATIVE_ONLY) ) if(NOT MSVC) - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_march_native "-march=native") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_march_native "-march=native") if(_has_march_native) set(CYCLES_KERNEL_FLAGS "-march=native") else() @@ -45,18 +45,18 @@ if(WITH_CYCLES_NATIVE_ONLY) unset(_has_march_native) else() if(NOT MSVC_NATIVE_ARCH_FLAGS) - TRY_RUN( - arch_run_result - arch_compile_result - ${CMAKE_CURRENT_BINARY_DIR}/ - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/msvc_arch_flags.c - COMPILE_OUTPUT_VARIABLE arch_compile_output - RUN_OUTPUT_VARIABLE arch_run_output - ) - if(arch_compile_result AND "${arch_run_result}" EQUAL "0") - string(STRIP ${arch_run_output} arch_run_output) - set(MSVC_NATIVE_ARCH_FLAGS ${arch_run_output} CACHE STRING "MSVC Native architecture flags") - endif() + try_run( + arch_run_result + arch_compile_result + ${CMAKE_CURRENT_BINARY_DIR}/ + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/msvc_arch_flags.c + COMPILE_OUTPUT_VARIABLE arch_compile_output + RUN_OUTPUT_VARIABLE arch_run_output + ) + if(arch_compile_result AND "${arch_run_result}" EQUAL "0") + string(STRIP ${arch_run_output} arch_run_output) + set(MSVC_NATIVE_ARCH_FLAGS ${arch_run_output} CACHE STRING "MSVC Native architecture flags") + endif() endif() set(CYCLES_KERNEL_FLAGS "${MSVC_NATIVE_ARCH_FLAGS}") endif() @@ -364,7 +364,7 @@ endif() # Warnings if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") unset(_has_no_error_unused_macros) endif() diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index a89c5679b27..ee0cefa823e 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -529,7 +529,7 @@ if(WITH_CYCLES_CUDA_BINARIES) endif() if(DEFINED cuda_nvcc_executable AND DEFINED cuda_toolkit_root_dir) # Compile regular kernel - CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} kernel "" "${cuda_sources}" FALSE) + cycles_cuda_kernel_add(${arch} ${prev_arch} kernel "" "${cuda_sources}" FALSE) if(WITH_CYCLES_CUDA_BUILD_SERIAL) set(prev_arch ${arch}) @@ -611,7 +611,7 @@ if(WITH_CYCLES_HIP_BINARIES AND WITH_CYCLES_DEVICE_HIP) foreach(arch ${CYCLES_HIP_BINARIES_ARCH}) # Compile regular kernel - CYCLES_HIP_KERNEL_ADD(${arch} kernel "" "${hip_sources}" FALSE) + cycles_hip_kernel_add(${arch} kernel "" "${hip_sources}" FALSE) endforeach() add_custom_target(cycles_kernel_hip ALL DEPENDS ${hip_fatbins}) @@ -696,11 +696,11 @@ if(WITH_CYCLES_DEVICE_OPTIX AND WITH_CYCLES_CUDA_BINARIES) delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${output}" ${CYCLES_INSTALL_PATH}/lib) endmacro() - CYCLES_OPTIX_KERNEL_ADD( + cycles_optix_kernel_add( kernel_optix "device/optix/kernel.cu" "") - CYCLES_OPTIX_KERNEL_ADD( + cycles_optix_kernel_add( kernel_optix_shader_raytrace "device/optix/kernel_shader_raytrace.cu" "--keep-device-functions") @@ -950,8 +950,8 @@ endif() # Warnings to avoid using doubles in the kernel. if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER_ID MATCHES "Clang") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") - ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") + add_check_cxx_compiler_flag(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") unset(_has_cxxflag_float_conversion) unset(_has_cxxflag_double_promotion) endif() diff --git a/intern/cycles/scene/CMakeLists.txt b/intern/cycles/scene/CMakeLists.txt index 10a06ee595d..1bce93aa140 100644 --- a/intern/cycles/scene/CMakeLists.txt +++ b/intern/cycles/scene/CMakeLists.txt @@ -101,7 +101,7 @@ if(WITH_CYCLES_OSL) cycles_kernel_osl ) - SET_PROPERTY(SOURCE osl.cpp PROPERTY COMPILE_FLAGS ${RTTI_DISABLE_FLAGS}) + set_property(SOURCE osl.cpp PROPERTY COMPILE_FLAGS ${RTTI_DISABLE_FLAGS}) endif() if(WITH_OPENCOLORIO) diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 3f64febf4df..b126247de5f 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -59,5 +59,5 @@ if(NOT APPLE) endif() if(WITH_GTESTS) - BLENDER_SRC_GTEST(cycles "${SRC}" "${LIB}") + blender_src_gtest(cycles "${SRC}" "${LIB}") endif() diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt index 7df1a94bbd8..1dddd70928a 100644 --- a/intern/opensubdiv/CMakeLists.txt +++ b/intern/opensubdiv/CMakeLists.txt @@ -81,11 +81,11 @@ if(WITH_OPENSUBDIV) ) endif() - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENMP) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_OPENCL) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_CUDA) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) - OPENSUBDIV_DEFINE_COMPONENT(OPENSUBDIV_HAS_GLSL_COMPUTE) + opensubdiv_define_component(OPENSUBDIV_HAS_OPENMP) + opensubdiv_define_component(OPENSUBDIV_HAS_OPENCL) + opensubdiv_define_component(OPENSUBDIV_HAS_CUDA) + opensubdiv_define_component(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK) + opensubdiv_define_component(OPENSUBDIV_HAS_GLSL_COMPUTE) if(WIN32) add_definitions(-DNOMINMAX) |