diff options
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindEmbree.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/buildinfo.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 | ||||
| -rw-r--r-- | build_files/cmake/packaging.cmake | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake index 7f7f2ae0fb3..e6105a885f3 100644 --- a/build_files/cmake/Modules/FindEmbree.cmake +++ b/build_files/cmake/Modules/FindEmbree.cmake @@ -34,7 +34,7 @@ FIND_PATH(EMBREE_INCLUDE_DIR include ) -IF(NOT (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))) +IF(NOT (("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64") OR (APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")))) SET(_embree_SIMD_COMPONENTS embree_sse42 embree_avx diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index a349ffc1b56..2b39c36a4e9 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -79,7 +79,7 @@ if(EXISTS ${SOURCE_DIR}/.git) ERROR_QUIET) if(NOT _git_below_check STREQUAL "") # If there're commits between HEAD and upstream this means - # that we're reset-ed to older revision. Use it's hash then. + # that we're reset-ed to older revision. Use its hash then. execute_process(COMMAND git rev-parse --short=12 HEAD WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE MY_WC_HASH diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 91881441c95..813ac013cdf 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -923,10 +923,6 @@ function(get_blender_version) math(EXPR _out_version_major "${_out_version} / 100") math(EXPR _out_version_minor "${_out_version} % 100") - # Zero pad the minor version so `_out_version_minor` is always two characters. - # This is needed if the minor version is a single digit. - string(REGEX REPLACE "^([0-9])$" "0\\1" _out_version_minor "${_out_version_minor}") - # output vars set(BLENDER_VERSION "${_out_version_major}.${_out_version_minor}" PARENT_SCOPE) set(BLENDER_VERSION_MAJOR "${_out_version_major}" PARENT_SCOPE) diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 4a0a4f2493d..265b3c0e2ab 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -104,8 +104,8 @@ if(WIN32) set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium) endif() -set(CPACK_PACKAGE_EXECUTABLES "blender" "blender") -set(CPACK_CREATE_DESKTOP_LINKS "blender" "blender") +set(CPACK_PACKAGE_EXECUTABLES "blender-launcher" "blender") +set(CPACK_CREATE_DESKTOP_LINKS "blender-launcher" "blender") include(CPack) |