From 692678099c11fe8ffebad5d69fb095bafeb95af8 Mon Sep 17 00:00:00 2001 From: Bart Beumer Date: Thu, 30 Jan 2025 22:22:22 +0100 Subject: [PATCH] Update required CMake version. use conan. --- 3rdparty-boost.cmake | 25 ------------------------ 3rdparty-googletest.cmake | 37 ------------------------------------ CMakeLists.txt | 4 +--- bmrshared/lib/CMakeLists.txt | 2 +- bmrshared/tst/CMakeLists.txt | 9 +++++++-- conanfile.txt | 7 +++++++ 6 files changed, 16 insertions(+), 68 deletions(-) delete mode 100644 3rdparty-boost.cmake delete mode 100644 3rdparty-googletest.cmake create mode 100644 conanfile.txt diff --git a/3rdparty-boost.cmake b/3rdparty-boost.cmake deleted file mode 100644 index b907e8b..0000000 --- a/3rdparty-boost.cmake +++ /dev/null @@ -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/ -) diff --git a/3rdparty-googletest.cmake b/3rdparty-googletest.cmake deleted file mode 100644 index c73b77e..0000000 --- a/3rdparty-googletest.cmake +++ /dev/null @@ -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 -) - - diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e95320..b4d6c65 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/bmrshared/lib/CMakeLists.txt b/bmrshared/lib/CMakeLists.txt index 2d1565d..3992ce5 100644 --- a/bmrshared/lib/CMakeLists.txt +++ b/bmrshared/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.20) project(bmrshared) diff --git a/bmrshared/tst/CMakeLists.txt b/bmrshared/tst/CMakeLists.txt index 81c05f8..c0ce19f 100644 --- a/bmrshared/tst/CMakeLists.txt +++ b/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( diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000..218cfb2 --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,7 @@ +[requires] +boost/1.84.0 +gtest/1.14.0 + +[generators] +CMakeDeps +CMakeToolchain