[Bf-blender-cvs] [b4ee86194a8] mac_arm64: deps: Cleanup.

Stefan Werner noreply at git.blender.org
Sun Jul 12 15:52:21 CEST 2020 

Commit: b4ee86194a859cda6b9542cfd889a2ef7bc6b95e
Author: Stefan Werner
Date:   Sun Jul 12 08:33:02 2020 +0200
Branches: mac_arm64
https://developer.blender.org/rBb4ee86194a859cda6b9542cfd889a2ef7bc6b95e

deps: Cleanup.

===================================================================

M	build_files/build_environment/CMakeLists.txt
M	build_files/build_environment/cmake/harvest.cmake
M	build_files/build_environment/cmake/opencolorio.cmake
M	build_files/build_environment/cmake/options.cmake
M	build_files/build_environment/cmake/png.cmake
M	build_files/build_environment/cmake/python.cmake
M	build_files/build_environment/cmake/ssl.cmake
M	build_files/build_environment/cmake/vpx.cmake
M	build_files/build_environment/cmake/x264.cmake
D	build_files/build_environment/patches/png.diff

===================================================================

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 667125bc173..d1c71230779 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -86,7 +86,7 @@ include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 # Temporarily disabled until we get a full python building on macOS/arm64
-if((NOT APPLE) OR ("${OSX_ARCHITECTURES}" EQUAL "x86_64"))
+if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   include(cmake/python_site_packages.cmake)
   include(cmake/package_python.cmake)
   include(cmake/numpy.cmake)
@@ -97,7 +97,7 @@ if(UNIX)
 else()
   include(cmake/pugixml.cmake)
 endif()
-if((NOT APPLE) OR ("${OSX_ARCHITECTURES}" EQUAL "x86_64"))
+if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   include(cmake/ispc.cmake)
   include(cmake/openimagedenoise.cmake)
   include(cmake/embree.cmake)
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 5e9641181a3..f860778a6a1 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -132,7 +132,7 @@ harvest(openimageio/bin openimageio/bin "maketx")
 harvest(openimageio/bin openimageio/bin "oiiotool")
 harvest(openimageio/include openimageio/include "*")
 harvest(openimageio/lib openimageio/lib "*.a")
-if((NOT APPLE) OR ("${OSX_ARCHITECTURES}" EQUAL "x86_64"))
+if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   harvest(openimagedenoise/include openimagedenoise/include "*")
   harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
   harvest(embree/include embree/include "*.h")
diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake
index e5f1c12077c..e8b0043edf7 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -30,7 +30,7 @@ set(OPENCOLORIO_EXTRA_ARGS
   -DOCIO_STATIC_JNIGLUE=OFF
 )
 
-if(APPLE AND NOT("${OSX_ARCHITECTURES}" EQUAL "x86_64"))
+if(APPLE AND NOT("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64"))
   set(OPENCOLORIO_EXTRA_ARGS
      ${OPENCOLORIO_EXTRA_ARGS}
      -DOCIO_USE_SSE=OFF
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 2a7b67d5184..fe2f1fa34e5 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -117,28 +117,28 @@ else()
       COMMAND xcodebuild -version -sdk macosx SDKVersion
       OUTPUT_VARIABLE MACOSX_SDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    if(NOT DEFINED OSX_ARCHITECTURES)
+    if(NOT CMAKE_OSX_ARCHITECTURES)
       execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
       message(STATUS "Detected native architecture ${ARCHITECTURE}.")
-      set(OSX_ARCHITECTURES "${ARCHITECTURE}")
+      set(CMAKE_OSX_ARCHITECTURES "${ARCHITECTURE}")
     endif()
-    if(${OSX_ARCHITECTURES} EQUAL "x86_64")
+    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
       set(OSX_DEPLOYMENT_TARGET 10.13)
     else()
       set(OSX_DEPLOYMENT_TARGET 11.00)
     endif()
     set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
 
-    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${OSX_ARCHITECTURES}")
-    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${OSX_ARCHITECTURES}")
-    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${OSX_ARCHITECTURES}")
-    if(${OSX_ARCHITECTURES} EQUAL "x86_64")
+    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
+    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
       set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin17.0.0) # OS X 10.13
     else()
       set(PLATFORM_BUILD_TARGET --build=aarch64-apple-darwin20.0.0) # macOS 11.00
     endif()
     set(PLATFORM_CMAKE_FLAGS
-      -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
+      -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
       -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
       -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
     )
diff --git a/build_files/build_environment/cmake/png.cmake b/build_files/build_environment/cmake/png.cmake
index 78648ce47d2..63ca7566fa1 100644
--- a/build_files/build_environment/cmake/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -22,8 +22,8 @@ set(PNG_EXTRA_ARGS
   -DPNG_STATIC=ON
 )
 
-if(APPLE AND ("${OSX_ARCHITECTURES}" STREQUAL "arm64"))
-  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON  -DPNG_ARM_NEON=on)
+if(APPLE AND ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64"))
+  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON  -DCMAKE_SYSTEM_PROCESSOR="aarch64")
 endif()
 
 ExternalProject_Add(external_png
@@ -31,7 +31,6 @@ ExternalProject_Add(external_png
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH SHA256=${PNG_HASH}
   PREFIX ${BUILD_DIR}/png
-  PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/png/src/external_png < ${PATCH_DIR}/png.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/png
 )
diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake
index 8b6a77916a7..e852d2c1d09 100644
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -69,7 +69,7 @@ else()
       export ac_cv_header_libintl_h=no &&
       export ac_cv_lib_intl_textdomain=no
     )
-    if("${OSX_ARCHITECTURES}" STREQUAL "arm64")
+    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
       set(PYTHON_FUNC_CONFIGS ${PYTHON_FUNC_CONFIGS} && export PYTHON_DECIMAL_WITH_MACHINE=ansi64)
     endif()
     set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
diff --git a/build_files/build_environment/cmake/ssl.cmake b/build_files/build_environment/cmake/ssl.cmake
index ec0db94bc43..b7d0fd9e097 100644
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -20,7 +20,7 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)
 
 if(APPLE)
-  if("${OSX_ARCHITECTURES}" STREQUAL "arm64")
+  if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
     set(SSL_OS_COMPILER "blender-darwin-arm64")
   else()
     set(SSL_OS_COMPILER "blender-darwin-x86_64")
diff --git a/build_files/build_environment/cmake/vpx.cmake b/build_files/build_environment/cmake/vpx.cmake
index d8b6dfbfe24..799dea0189c 100644
--- a/build_files/build_environment/cmake/vpx.cmake
+++ b/build_files/build_environment/cmake/vpx.cmake
@@ -24,10 +24,10 @@ if(WIN32)
   endif()
 else()
   if(APPLE)
-    if("${OSX_ARCHITECTURES}" STREQUAL "arm64")
+    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
       set(VPX_EXTRA_FLAGS --target=generic-gnu)
     else()
-      set(VPX_EXTRA_FLAGS --target=x86-64-darwin13-gcc)
+      set(VPX_EXTRA_FLAGS --target=x86_64-darwin17-gcc)
     endif()
   else()
     set(VPX_EXTRA_FLAGS --target=generic-gnu)
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake
index df5205a8e95..993e4591cb7 100644
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -22,7 +22,7 @@ endif()
 
 
 if(APPLE)
-  if("${OSX_ARCHITECTURES}" STREQUAL "arm64")
+  if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
     set(X264_EXTRA_ARGS ${X264_EXTRA_ARGS} "--disable-asm")
     set(X264_CONFIGURE_ENV echo .)
   else()
diff --git a/build_files/build_environment/patches/png.diff b/build_files/build_environment/patches/png.diff
deleted file mode 100644
index 858b7b5ce94..00000000000
--- a/build_files/build_environment/patches/png.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff ./CMakeLists.txt ./CMakeLists.txt
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -85,7 +85,9 @@
- if(PNG_HARDWARE_OPTIMIZATIONS)
- # set definitions and sources for arm
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
--  CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
-+  CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm64"
-+ OR(${PNG_ARM_NEON} STREQUAL "on")
-+       )
-   set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
-   set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
-      check: (default) use internal checking code;
-
-
-

More information about the Bf-blender-cvs mailing list