fixed conan issues after upgrade

Author: StephanKa

conan/conanfile_default.txt.in

@@ -3,8 +3,8 @@
 catch2/3.3.2
 gtest/1.13.0
 docopt.cpp/0.6.3
-fmt/10.1.0
-spdlog/1.11.0
+fmt/10.0.0
+spdlog/1.12.0
 sml/1.1.6
 nlohmann_json/3.11.2
 boost/1.81.0
@@ -15,6 +15,3 @@ protobuf/3.21.9
 [generators]
 CMakeDeps
 CMakeToolchain
-
-[options]
-gtest:build_gmock=True

fuzz_test/CMakeLists.txt

@@ -6,7 +6,7 @@ TARGET_LINK_LIBRARIES(
         fuzz_tester
         PRIVATE project_options
         project_warnings
-        CONAN_PKG::fmt
+        fmt::fmt
         -coverage
         -fsanitize=fuzzer,undefined,address)
 TARGET_COMPILE_OPTIONS(fuzz_tester PRIVATE -fsanitize=fuzzer,undefined,address)

src/CMakeLists.txt

@@ -31,14 +31,17 @@ IF(CPP_STARTER_USE_CPPZMQ_PROTO)
 ENDIF()
 
 
+FIND_PACKAGE(docopt REQUIRED)
+FIND_PACKAGE(spdlog REQUIRED)
+FIND_PACKAGE(fmt REQUIRED)
 # Generic test that uses conan libs
 ADD_EXECUTABLE(intro main.cpp)
 TARGET_LINK_LIBRARIES(
         intro
         PRIVATE project_options
         project_warnings
-        CONAN_PKG::docopt.cpp
-        CONAN_PKG::fmt
-        CONAN_PKG::spdlog)
+        docopt_s
+        fmt::fmt
+        spdlog::spdlog)
 
 TARGET_INCLUDE_DIRECTORIES(intro PRIVATE ${CMAKE_BINARY_DIR}/generated)

src/boost.beast/CMakeLists.txt

@@ -1,4 +1,7 @@
 FIND_PACKAGE(Threads)
+FIND_PACKAGE(fmt REQUIRED)
+FIND_PACKAGE(nlohmann_json REQUIRED)
+FIND_PACKAGE(boost REQUIRED)
 
 ADD_EXECUTABLE(test_boost_beast main.cpp)
-TARGET_LINK_LIBRARIES(test_boost_beast PRIVATE ${CMAKE_THREAD_LIBS_INIT} CONAN_PKG::boost CONAN_PKG::nlohmann_json CONAN_PKG::fmt)
+TARGET_LINK_LIBRARIES(test_boost_beast PRIVATE ${CMAKE_THREAD_LIBS_INIT} boost::boost nlohmann_json::nlohmann_json fmt::fmt)

src/crow/CMakeLists.txt

@@ -1,2 +1,5 @@
+FIND_PACKAGE(Crow REQUIRED)
+FIND_PACKAGE(spdlog REQUIRED)
+
 ADD_EXECUTABLE(test_crow main.cpp)
-TARGET_LINK_LIBRARIES(test_crow PRIVATE CONAN_PKG::crowcpp-crow CONAN_PKG::spdlog)
+TARGET_LINK_LIBRARIES(test_crow PRIVATE Crow::Crow spdlog::spdlog)

src/crow/main.cpp

@@ -1,5 +1,5 @@
 /* example usage of crow-cpp http://crowcpp.org/ */
-#include "crow.h"
+#include <crow.h>
 
 class a : public crow::returnable
 {

src/protobuf.cppzmq/CMakeLists.txt

@@ -11,5 +11,5 @@ ADD_EXECUTABLE(test_cppzmq_proto_client client/main.cpp ${PROTO_SRCS} ${PROTO_HD
 TARGET_INCLUDE_DIRECTORIES(test_cppzmq_proto_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/common)
 TARGET_INCLUDE_DIRECTORIES(test_cppzmq_proto_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/common)
 
-TARGET_LINK_LIBRARIES(test_cppzmq_proto_server PRIVATE CONAN_PKG::spdlog CONAN_PKG::cppzmq CONAN_PKG::protobuf)
-TARGET_LINK_LIBRARIES(test_cppzmq_proto_client PRIVATE CONAN_PKG::spdlog CONAN_PKG::cppzmq CONAN_PKG::protobuf)
+TARGET_LINK_LIBRARIES(test_cppzmq_proto_server PRIVATE spdlog::spdlog cppzmq::cppzmq protobuf::protobuf)
+TARGET_LINK_LIBRARIES(test_cppzmq_proto_client PRIVATE spdlog::spdlog cppzmq::cppzmq protobuf::protobuf)

src/sml/CMakeLists.txt

@@ -1,2 +1,5 @@
+FIND_PACKAGE(sml REQUIRED)
+FIND_PACKAGE(spdlog REQUIRED)
+
 ADD_EXECUTABLE(test_sml main.cpp logger.h states.h events.h plantumlDump.h actions.h)
-TARGET_LINK_LIBRARIES(test_sml PRIVATE CONAN_PKG::sml CONAN_PKG::spdlog)
+TARGET_LINK_LIBRARIES(test_sml PRIVATE sml::sml spdlog::spdlog)

test/catch2/CMakeLists.txt

@@ -1,12 +1,10 @@
+FIND_PACKAGE(Catch2 REQUIRED)
+
 INCLUDE(CTest)
 INCLUDE(Catch)
 
-ADD_LIBRARY(catch_main STATIC catch_main.cpp)
-TARGET_LINK_LIBRARIES(catch_main PUBLIC CONAN_PKG::catch2)
-TARGET_LINK_LIBRARIES(catch_main PRIVATE project_options)
-
 ADD_EXECUTABLE(catch_tests tests.cpp)
-TARGET_LINK_LIBRARIES(catch_tests PRIVATE project_warnings project_options catch_main)
+TARGET_LINK_LIBRARIES(catch_tests PRIVATE project_warnings project_options Catch2::Catch2WithMain)
 
 # automatically discover tests that are defined in catch based test files you can modify the unittests. Set TEST_PREFIX
 # to whatever you want, or use different for different binaries
@@ -25,7 +23,7 @@ CATCH_DISCOVER_TESTS(
 
 # Add a file containing a set of constexpr tests
 ADD_EXECUTABLE(catch_constexpr_tests constexpr_tests.cpp)
-TARGET_LINK_LIBRARIES(catch_constexpr_tests PRIVATE project_options project_warnings catch_main)
+TARGET_LINK_LIBRARIES(catch_constexpr_tests PRIVATE project_options project_warnings Catch2::Catch2WithMain)
 
 CATCH_DISCOVER_TESTS(
         catch_constexpr_tests
@@ -43,7 +41,7 @@ CATCH_DISCOVER_TESTS(
 # Disable the constexpr portion of the test, and build again this allows us to have an executable that we can debug when
 # things go wrong with the constexpr testing
 ADD_EXECUTABLE(catch_relaxed_constexpr_tests constexpr_tests.cpp)
-TARGET_LINK_LIBRARIES(catch_relaxed_constexpr_tests PRIVATE project_options project_warnings catch_main)
+TARGET_LINK_LIBRARIES(catch_relaxed_constexpr_tests PRIVATE project_options project_warnings Catch2::Catch2WithMain)
 TARGET_COMPILE_DEFINITIONS(catch_relaxed_constexpr_tests PRIVATE -DCATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
 
 CATCH_DISCOVER_TESTS(