Use of cmake-conan.

Author: aarlt

CMakeLists.txt

@@ -2,14 +2,33 @@ cmake_minimum_required(VERSION 3.21)
 
 project(autobahn-cpp)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
+if (NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
+    message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
+    file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/develop/conan.cmake"
+            "${CMAKE_BINARY_DIR}/conan.cmake"
+            TLS_VERIFY ON)
+endif ()
 
-set(CMAKE_CXX_STANDARD 20)
+file(COPY ${CMAKE_SOURCE_DIR}/conanfile.py DESTINATION ${CMAKE_BINARY_DIR})
+
+include(${CMAKE_BINARY_DIR}/conan.cmake)
+
+set(CMAKE_CXX_STANDARD 17)
 
 option(AUTOBAHN_BUILD_EXAMPLES "Build examples" ON)
 option(AUTOBAHN_TESTS "Test" ON)
 
+conan_cmake_run(CONANFILE ${CMAKE_SOURCE_DIR}/conanfile.py
+        BASIC_SETUP CMAKE_TARGETS
+        BUILD missing)
+
+conan_cmake_autodetect(settings)
+
+conan_cmake_install(PATH_OR_REFERENCE .
+        BUILD missing
+        REMOTE conancenter
+        SETTINGS ${settings})
+
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Includes/CMakeLists.txt)
 if (AUTOBAHN_BUILD_EXAMPLES)
     add_subdirectory(examples)
@@ -18,5 +37,4 @@ endif (AUTOBAHN_BUILD_EXAMPLES)
 if (AUTOBAHN_TESTS)
     include(CTest)
     add_subdirectory(test)
-endif()
-
+endif ()

CMakePresets.json

@@ -7,7 +7,7 @@ class autobahn_cppConan(ConanFile):
     author = "Crossbar.io Technologies GmbH and contributors"
     description = "WAMP for C++ on Boost/ASIO"
     url = "https://github.com/crossbario/autobahn-cpp"
-    requires = "boost/1.77.0", "msgpack-cxx/4.0.3", "websocketpp/0.8.2", "openssl/3.0.1", "botan/2.19.1"
+    requires = "boost/1.77.0", "msgpack-cxx/4.0.3", "websocketpp/0.8.2", "openssl/3.0.1", "botan/2.19.1", "catch2/2.13.8"
     generators = "cmake"
     scm = {
         "type": "git",

conanfile.py

@@ -1,20 +1,12 @@
-Include(FetchContent)
-FetchContent_Declare(
-        Catch2
-        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-        GIT_TAG v3.0.0-preview3
-)
-FetchContent_MakeAvailable(Catch2)
-
 function(make_test name src)
     # By default MSVC has a 2^16 limit on the number of sections in an object file,
     # and this needs more than that.
     if (MSVC)
         set_source_files_properties(${src} PROPERTIES COMPILE_FLAGS /bigobj)
     endif ()
 
-    add_executable(${name} ${src} wamp_test.hpp ${PUBLIC_HEADERS})
-    target_link_libraries(${name} PRIVATE Catch2::Catch2WithMain autobahn_cpp)
+    add_executable(${name} ${src} wamp_test.hpp test_main.cpp ${PUBLIC_HEADERS})
+    target_link_libraries(${name} PRIVATE CONAN_PKG::catch2 autobahn_cpp)
     string(REPLACE "test_" "" pure_name ${name})
     add_test(NAME ${name} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh "${CMAKE_CURRENT_SOURCE_DIR}/${pure_name}" "$<TARGET_FILE:${name}>")
 endfunction()

test/CMakeLists.txt

@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "test/wamp_test.hpp"
-#include <catch2/catch_all.hpp>
+#include <catch2/catch.hpp>
 
 struct Config
 {

test/auth/auth.cpp

@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "test/wamp_test.hpp"
-#include <catch2/catch_all.hpp>
+#include <catch2/catch.hpp>
 
 struct Config
 {

test/calls/calls.cpp

@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "test/wamp_test.hpp"
-#include <catch2/catch_all.hpp>
+#include <catch2/catch.hpp>
 
 struct Config
 {

test/pubsub/pubsub.cpp

@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include <catch2/catch.hpp>