remove ninja dependency

open-quantum-safe · Jun 28, 2023 · 0ac2b43 · 0ac2b43
1 parent fbdb850
commit 0ac2b43
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -48,14 +48,6 @@ jobs:
         working-directory: openssl
       - name: Check OpenSSL install3 
         run: ls -laR .localopenssl32
-      - name: build liboqs
-        run: |
-           mkdir _build
-           cd _build
-           cmake -GNinja -DOPENSSL_ROOT_DIR=../.localopenssl32 -DCMAKE_INSTALL_PREFIX=../.localliboqs ${{ matrix.params.oqsconfig }}  ..
-           ninja
-           ninja install
-        working-directory: liboqs
       - name: Save OpenSSL
         id: cache-openssl-save
         if: steps.cache-openssl32.outputs.cache-hit != 'true'
@@ -64,8 +56,16 @@ jobs:
           path: |
             .localopenssl32
           key: ${{ runner.os }}-openssl32
+      - name: build liboqs
+        run: |
+           mkdir _build
+           cd _build
+           cmake -DOPENSSL_ROOT_DIR=../.localopenssl32 -DCMAKE_INSTALL_PREFIX=../.localliboqs ${{ matrix.params.oqsconfig }}  ..
+           make $MAKE_PARAMS
+           make install
+        working-directory: liboqs
       - name: build oqs-provider
-        run: liboqs_DIR=.localliboqs cmake -GNinja -DOPENSSL_ROOT_DIR=.localopenssl32 -S . -B _build && cd _build && ninja
+        run: liboqs_DIR=.localliboqs cmake -DOPENSSL_ROOT_DIR=.localopenssl32 -S . -B _build && cmake --build _build
       - name: Check resultant dylib
         run: ls -l  && pwd
         working-directory: _build/lib