fix cmake error; update github workflow

virtualsquare · Nov 15, 2024 · 1ecea68 · 1ecea68
1 parent 948bbf3
commit 1ecea68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,16 +20,17 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y autoconf automake
+          sudo apt-get install -y cmake
       - name: "Install dependencies (macOS)"
         if: runner.os == 'macOS'
         run: |
-            brew install autoconf automake libtool
+            brew install cmake
             autoupdate
       - name: "Build"
         run: |
-          autoreconf -fis
-          ./configure --prefix=/opt/vde
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_INSTALL_PREFIX=/opt/vde
           make
           sudo make install
       - name: "Smoke test"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@ option(ENABLE_PCAP "Enable pcap support" ON)
 option(ENABLE_TUNTAP "Enable tuntap support" ON)
 option(ENABLE_EXPERIMENTAL "Enable experimental features" OFF)
 option(ENABLE_PROFILE "Enable profiling options" OFF)
-option(WITH_CRYPT "Choose implementation for cryptcab (wolfssl or mbedtls)" "wolfssl")
+set(WITH_CRYPT "wolfssl" CACHE STRING "Choose implementation for cryptcab (wolfssl or mbedtls)")
 set(crypt ${WITH_CRYPT})
 
 # Set compiler flags