Weird osx build error fix in .yml and .sh

3MFConsortium · Jul 24, 2024 · 96e5046 · 96e5046
1 parent fb3a24f
commit 96e5046
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,7 +118,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - run: sh cmake/GenerateMake.sh "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64"
+      - run: sh cmake/GenerateMake.sh
       - run: cmake --build .
         working-directory: ./build
       - run: ctest -V
@@ -148,7 +148,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - run: sh cmake/GenerateMake.sh "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_BUILD_TYPE=Debug"
+      - run: sh cmake/GenerateMake.sh "Debug"
       - run: cmake --build .
         working-directory: ./build
       - run: ctest -V

diff --git a/cmake/GenerateMake.sh b/cmake/GenerateMake.sh
@@ -4,4 +4,22 @@ basepath="$(cd "$(dirname "$0")" && pwd)"
 builddir="$basepath/../build"
 mkdir -p "$builddir"
 cd "$builddir"
-cmake .. -G "Unix Makefiles" "$@"
+
+# Check if we are on macOS
+if [ "$(uname)" = "Darwin" ]; then
+    # Check if the first argument is Debug mode
+    if [ "$1" = "Debug" ]; then
+        shift # Remove the first argument to pass remaining arguments
+        cmake .. -G "Unix Makefiles" -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Debug "$@"
+    else
+        cmake .. -G "Unix Makefiles" -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release "$@"
+    fi
+else
+    # For Linux and other OSes
+    if [ "$1" = "Debug" ]; then
+        shift # Remove the first argument to pass remaining arguments
+        cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug "$@"
+    else
+        cmake .. -G "Unix Makefiles" "$@"
+    fi
+fi