Fix arm64

hannesa2 · Jul 17, 2024 · 8b612b2 · 8b612b2
1 parent 46dd4cb
commit 8b612b2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/scripts/darwin/package.cmake b/scripts/darwin/package.cmake
@@ -5,9 +5,16 @@ endif()
 # See build.sh and src/cmake/Darwin.cmake
 set(CPACK_GENERATOR External)
 
-get_target_property(MOC_LOCATION ${QT_PREFIX}::moc LOCATION)
-get_filename_component(MACDEPLOYQT_EXECUTABLE ${MOC_LOCATION}/../macdeployqt ABSOLUTE)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scripts/darwin/macdeployqt.cmake.in" "${CMAKE_BINARY_DIR}/macdeployqt.cmake" @ONLY)
+message(STATUS "MACDEPLOYQT_EXECUTABLE package-cmake.pre ${MACDEPLOYQT_EXECUTABLE}")
+message(STATUS "CMAKE_SYSTEM_PROCESSOR:       ${CMAKE_SYSTEM_PROCESSOR}")
+
+if(NOT "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64")
+    get_target_property(MOC_LOCATION ${QT_PREFIX}::moc LOCATION)
+    get_filename_component(MACDEPLOYQT_EXECUTABLE ${MOC_LOCATION}/../macdeployqt ABSOLUTE)
+    message(STATUS "MACDEPLOYQT_EXECUTABLE x86 package-cmake ${MACDEPLOYQT_EXECUTABLE}")
+else()
+    message(STATUS "MACDEPLOYQT_EXECUTABLE arm64 package-cmake ${MACDEPLOYQT_EXECUTABLE}")
+endif()
 
 set(CPACK_EXTERNAL_PACKAGE_SCRIPT "${CMAKE_BINARY_DIR}/macdeployqt.cmake")