added build for ubuntu latest, set flags in cmakelists

INTO-CPS-Association · Oct 16, 2024 · 9f0d689 · 9f0d689
1 parent 5aeb466
commit 9f0d689
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/loadLibraryTest.yml b/.github/workflows/loadLibraryTest.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest,ubuntu-20.04]
+        os: [windows-latest,ubuntu-latest]
 
     steps:
       - uses: TheMrMilchmann/setup-msvc-dev@v3
@@ -69,7 +69,7 @@ jobs:
           cmake --version
 
       - name: Build
-        if: matrix.os == 'windows-latest'
+        #if: matrix.os == 'windows-latest'
         shell: bash
         run: |
           export target=$(cat target)

diff --git a/rabbitmq-fmu/CMakeLists.txt b/rabbitmq-fmu/CMakeLists.txt
@@ -82,7 +82,8 @@ else()
     find_package(Threads REQUIRED)
     set(OPENSSL_ROOT_DIR "C:\\Program Files\\Common Files\\SSL")
     set(OPENSSL_USE_STATIC_LIBS TRUE)
-    set(RMQ_OPENSSL_MIN_VERSION 3.0.0)
+    set(OPENSSL_MIN_VERSION 3.0.0)
+    set(OPENSSL_NO_DEPRECATED_3_0 TRUE)
     find_package(OpenSSL REQUIRED)
     target_link_libraries(rabbitmq XercesC::XercesC rabbitmq-static tz rabbitmq-core Threads::Threads OpenSSL::SSL OpenSSL::Crypto -static )
     #target_link_libraries(rabbitmq XercesC::XercesC rabbitmq-static tz rabbitmq-core)