Update required CMake version. use conan.
This commit is contained in:
parent
14dec24c54
commit
692678099c
|
|
@ -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/
|
|
||||||
)
|
|
||||||
|
|
@ -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
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.20)
|
||||||
|
|
||||||
project(all)
|
project(all)
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
||||||
include(3rdparty-boost.cmake)
|
|
||||||
include(3rdparty-googletest.cmake)
|
|
||||||
add_subdirectory(bmrshared)
|
add_subdirectory(bmrshared)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.20)
|
||||||
|
|
||||||
project(bmrshared)
|
project(bmrshared)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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)
|
project(bmrshared-test)
|
||||||
add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
|
add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
|
||||||
|
|
@ -19,7 +22,9 @@ target_link_libraries(
|
||||||
${PROJECT_NAME}
|
${PROJECT_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
bmrshared
|
bmrshared
|
||||||
3rdparty-googletest-main
|
GTest::gtest_main
|
||||||
|
GTest::gmock
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
[requires]
|
||||||
|
boost/1.84.0
|
||||||
|
gtest/1.14.0
|
||||||
|
|
||||||
|
[generators]
|
||||||
|
CMakeDeps
|
||||||
|
CMakeToolchain
|
||||||
Loading…
Reference in New Issue