Merge pull request #6 from pro3d-space/main

Fix x64 osx build

Author: DaKup

.github/workflows/cmake-multi-platform.yml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         # os: [ubuntu-latest, windows-latest, macos-latest]
 #        os: [ubuntu-latest, windows-latest]
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
         build_type: [Release]
         # c_compiler: [gcc, clang, cl]
         c_compiler: [gcc, cl, clang]
@@ -53,10 +53,10 @@ jobs:
 #            spice_dl_url: https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacM1_OSX_clang_64bit/packages/cspice.tar.Z
 #            spice_zip_filename: cspice.tar.Z
 #            spice_lib_filename: cspice.a
-          - os: macos-latest
+          - os: macos-13
             c_compiler: gcc
             cpp_compiler: g++
-            # arch: arm64
+            arch: x64
             spice_dl_url: https://naif.jpl.nasa.gov/pub/naif/toolkit//C/MacIntel_OSX_AppleC_64bit/packages/cspice.tar.Z
             spice_zip_filename: cspice.tar.Z
             spice_lib_filename: cspice.a
@@ -67,9 +67,9 @@ jobs:
             c_compiler: clang
           - os: ubuntu-latest
             c_compiler: cl
-          - os: macos-latest
+          - os: macos-13
             c_compiler: cl
-          - os: macos-latest
+          - os: macos-13
             c_compiler: clang
 
     runs-on: ${{ matrix.os }}
@@ -93,7 +93,7 @@ jobs:
     - if: matrix.os == 'ubuntu-latest'
       run: tar -xf "${{ github.workspace }}/${{ matrix.spice_zip_filename }}" && rm "${{ github.workspace }}/${{ matrix.spice_zip_filename }}"
 
-    - if: matrix.os == 'macos-latest'
+    - if: matrix.os == 'macos-13'
       run: tar -xf "${{ github.workspace }}/${{ matrix.spice_zip_filename }}" && rm "${{ github.workspace }}/${{ matrix.spice_zip_filename }}"
 
     - name: Set reusable strings

CMakePresets.json

@@ -43,6 +43,26 @@
                     "value": "${sourceDir}/cspice/lib/cspice.a"
                 }
             }
+        },
+        {
+            "name": "osx-configure",
+            "displayName": "osx Configure",
+            "description": "Using compilers: C = /usr/bin/gcc, CXX = /usr/bin/g++",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
+                "CMAKE_C_COMPILER": "/usr/bin/gcc",
+                "CMAKE_CXX_COMPILER": "/usr/bin/g++",
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CSPICE_INCLUDE_DIR": {
+                    "type": "FILEPATH",
+                    "value": "${sourceDir}/cspice/include"
+                },
+                "CSPICE_LIBRARY_RELEASE": {
+                    "type": "FILEPATH",
+                    "value": "${sourceDir}/cspice/lib/cspice.a"
+                }
+            }
         }
     ],
     "buildPresets": [
@@ -53,6 +73,10 @@
         {
             "name": "linux-build",
             "configurePreset": "linux-configure"
+        },
+        {
+            "name": "osx-build",
+            "configurePreset": "osx-configure"
         }
     ]
 }