macOS: make sure that we build our new static library using the correct architecture.

Author: agarny

cmake/staticlibrary/CMakeLists.txt

@@ -48,6 +48,16 @@ foreach(LIBRARY ${LIBRARIES})
     list(APPEND OBJECT_FILES ${OBJ_FILES})
 endforeach()
 
+# Specify the target architecture.
+
+if(APPLE)
+    if("${TARGET_ARCHITECTURE}" STREQUAL "Intel")
+        set(CMAKE_OSX_ARCHITECTURES x86_64)
+    else()
+        set(CMAKE_OSX_ARCHITECTURES arm64)
+    endif()
+endif()
+
 # Create a new static library for libOpenCOR.
 
 add_library(${CMAKE_PROJECT_NAME} STATIC

src/CMakeLists.txt

@@ -433,6 +433,7 @@ if(    NOT EMSCRIPTEN
         CMAKE_ARGS
             -DPREBUILT_DIR=${PREBUILT_DIR}
             -DLIBOPENCOR_STATIC_LIBRARY=$<TARGET_FILE:${CMAKE_PROJECT_NAME}>
+            -DTARGET_ARCHITECTURE=${LIBOPENCOR_TARGET_ARCHITECTURE}
         INSTALL_COMMAND
             ""
         DEPENDS