Merge pull request 'Update required CMake version. use conan.' (#8) from develop-update into master

Reviewed-on: https://git.4beumer.nl/bart/network-experiment/pulls/8

3rdparty-boost.cmake

@@ -1,25 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-project(3rdparty-boost)
-add_library(
-    ${PROJECT_NAME}
-    STATIC
-    empty.cpp
-)
-
-set_property(
-    TARGET ${PROJECT_NAME}
-    PROPERTY CXX_STANDARD 20
-)
-
-target_link_libraries(
-    ${PROJECT_NAME}
-    INTERFACE
-    /home/bart/Development/3rd-party/boost/boost_1_81_0/lib/libboost_url.a
-    /home/bart/Development/3rd-party/boost/boost_1_81_0/lib/libboost_json.a
-)
-
-target_include_directories(
-    ${PROJECT_NAME}
-    PUBLIC /home/bart/Development/3rd-party/boost/boost_1_81_0/include/
-)

3rdparty-googletest.cmake

@@ -1,37 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-project(3rdparty-googletest)
-
-find_package(GTest REQUIRED)
-
-add_library(
-    ${PROJECT_NAME}
-    STATIC
-    empty.cpp
-)
-
-target_link_libraries(
-    ${PROJECT_NAME}
-    INTERFACE
-    GTest::gtest
-    GTest::gmock
-)
-
-
-
-project(3rdparty-googletest-main)
-
-add_library(
-    ${PROJECT_NAME}
-    STATIC
-    empty.cpp
-)
-
-target_link_libraries(
-    ${PROJECT_NAME}
-    INTERFACE
-    3rdparty-googletest
-    GTest::gtest_main
-)
-
-

CMakeLists.txt

@@ -1,8 +1,6 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 project(all)
 enable_testing()
 
-include(3rdparty-boost.cmake)
-include(3rdparty-googletest.cmake)
 add_subdirectory(bmrshared)

bmrshared/lib/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
 
 project(bmrshared)
 

bmrshared/tst/CMakeLists.txt

@@ -1,4 +1,7 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.20)
+
+find_package(GTest REQUIRED)
+include(GoogleTest)
 
 project(bmrshared-test)
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
@@ -19,7 +22,9 @@ target_link_libraries(
     ${PROJECT_NAME}
     PUBLIC
     bmrshared
-    3rdparty-googletest-main
+    GTest::gtest_main
+    GTest::gmock
+
 )
 
 install(

conanfile.txt

@@ -0,0 +1,7 @@
+[requires]
+boost/1.84.0
+gtest/1.14.0
+
+[generators]
+CMakeDeps
+CMakeToolchain