build release binaries in CI for all platforms (#706)

* move CMAKE_BUILD_TYPE to ci-build profile * don't build tests unless flag is set * get catch2 version that builds on newer gcc (12+)
openziti · Aug 16, 2023 · 030a9a4 · 030a9a4
1 parent 40c152f
commit 030a9a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -79,10 +79,7 @@
         "flags-unix",
         "ci-std",
         "ninja-multi-config"
-      ],
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
+      ]
     },
     {
       "name": "ci-win64",
@@ -112,6 +109,7 @@
       "binaryDir": "${sourceDir}/build",
       "hidden": true,
       "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
         "TLSUV_TLSLIB": "openssl"
       }
     },

diff --git a/lib/ziti-tunnel-cbs/CMakeLists.txt b/lib/ziti-tunnel-cbs/CMakeLists.txt
@@ -42,4 +42,6 @@ install(TARGETS ziti-tunnel-cbs-c
         DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
         )
 
-add_subdirectory(tests)
+if(ZITI_TUNNEL_BUILD_TESTS)
+  add_subdirectory(tests)
+endif()
diff --git a/lib/ziti-tunnel/CMakeLists.txt b/lib/ziti-tunnel/CMakeLists.txt
@@ -69,4 +69,6 @@ install(TARGETS lwipcore ziti-tunnel-sdk-c
         DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
         )
 
-add_subdirectory(tests)
+if(ZITI_TUNNEL_BUILD_TESTS)
+  add_subdirectory(tests)
+endif()
diff --git a/vcpkg.json b/vcpkg.json
@@ -17,6 +17,7 @@
       "description": "Dependencies for testing",
       "dependencies": [
         {
+          "version>=": "3.3.1",
           "name": "catch2"
         }
       ]