Fixing the CMake test.

wolfSSL · Feb 6, 2024 · ded661d · ded661d
1 parent 6d10ffc
commit ded661d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
@@ -21,24 +21,17 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y cmake
 
-#pull and build wolfssl
-    - uses: actions/checkout@master
+#pull wolfssl
+    - name: Checkout wolfssl
+      uses: actions/checkout@master
       with:
         repository: wolfssl/wolfssl
         path: wolfssl
-    - name: Build wolfssl
-      working-directory: ./wolfssl
-      run: |
-        mkdir build
-        cd build
-        cmake -DWOLFSSL_TPM=yes ..
-        make
-        sudo make install
 
 #build wolftpm
     - name: Build wolfTPM
       run: |
         mkdir build
         cd build
-        cmake -DWOLFTPM_INTERFACE=SWTPM ..
-        make
+        cmake -DWOLFTPM_INTERFACE=SWTPM -DWITH_WOLFSSL_TREE="$GITHUB_WORKSPACE/wolfssl" ..
+        cmake --build .
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,7 +132,7 @@ if (WITH_WOLFSSL)
     target_link_libraries(wolftpm PUBLIC wolfssl)
     target_include_directories(wolftpm PUBLIC ${WITH_WOLFSSL}/include)
     target_link_directories(wolftpm PUBLIC ${WITH_WOLFSSL}/lib)
-    elseif (WITH_WOLFSSL_TREE)
+elseif (WITH_WOLFSSL_TREE)
     set(WOLFSSL_TPM "yes" CACHE STRING "")
     set(WOLFSSL_EXAMPLES "no" CACHE STRING "")
     set(WOLFSSL_CRYPT_TESTS "no" CACHE STRING "")