fix cmake: find_package(Boost CONFIG)

commit_hash:9cbee781244b553e667d421ef1c7e311b06eddf3
userver-framework · Nov 29, 2024 · e0aefc2 · e0aefc2
1 parent 95bd775
commit e0aefc2
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/cmake/install/userver-core-config.cmake b/cmake/install/userver-core-config.cmake
@@ -8,7 +8,7 @@ find_package(userver REQUIRED COMPONENTS
     universal
 )
 
-find_package(Boost REQUIRED COMPONENTS
+find_package(Boost REQUIRED CONFIG COMPONENTS
     locale
     iostreams
 )

diff --git a/cmake/install/userver-universal-config.cmake b/cmake/install/userver-universal-config.cmake
@@ -7,7 +7,7 @@ endif()
 include("${USERVER_CMAKE_DIR}/ModuleHelpers.cmake")
 
 find_package(Threads)
-find_package(Boost REQUIRED COMPONENTS
+find_package(Boost REQUIRED CONFIG COMPONENTS
     program_options
     filesystem
     regex

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -44,7 +44,7 @@ file(GLOB_RECURSE INTERNAL_SOURCES
 
 list (REMOVE_ITEM SOURCES ${INTERNAL_SOURCES})
 
-find_package(Boost REQUIRED COMPONENTS
+find_package(Boost REQUIRED CONFIG COMPONENTS
     program_options
     filesystem
     locale
@@ -148,7 +148,7 @@ if (USERVER_FEATURE_UBOOST_CORO)
         ${CMAKE_CURRENT_SOURCE_DIR}/uboost_coro/include
     )
 else()
-    find_package(Boost REQUIRED COMPONENTS
+    find_package(Boost REQUIRED CONFIG COMPONENTS
         context
         coroutine
     )

diff --git a/third_party/uboost_coro/CMakeLists.txt b/third_party/uboost_coro/CMakeLists.txt
@@ -103,6 +103,6 @@ if(UBOOST_CORO_USE_UCONTEXT)
   endif()
 endif()
 
-find_package(Boost REQUIRED)
+find_package(Boost REQUIRED CONFIG)
 target_link_libraries(${PROJECT_NAME} PUBLIC Boost::boost userver-internal-compile-options)
 _userver_install_targets(COMPONENT core TARGETS ${PROJECT_NAME})
diff --git a/tools/congestion-control-emulator/CMakeLists.txt b/tools/congestion-control-emulator/CMakeLists.txt
@@ -2,7 +2,7 @@ project(userver-tool-congestion-control-emulator CXX)
 
 file(GLOB_RECURSE SOURCES *.cpp)
 
-find_package(Boost REQUIRED COMPONENTS program_options)
+find_package(Boost REQUIRED CONFIG COMPONENTS program_options)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 target_link_libraries(${PROJECT_NAME}

diff --git a/tools/dns-resolver/CMakeLists.txt b/tools/dns-resolver/CMakeLists.txt
@@ -2,7 +2,7 @@ project(userver-tool-dns-resolver CXX)
 
 file(GLOB_RECURSE SOURCES *.cpp)
 
-find_package(Boost REQUIRED COMPONENTS program_options)
+find_package(Boost REQUIRED CONFIG COMPONENTS program_options)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 target_link_libraries(${PROJECT_NAME}

diff --git a/tools/engine-perf/CMakeLists.txt b/tools/engine-perf/CMakeLists.txt
@@ -2,7 +2,7 @@ project(userver-tool-engine-perf)
 
 file(GLOB_RECURSE SOURCES *.cpp)
 
-find_package(Boost REQUIRED COMPONENTS program_options)
+find_package(Boost REQUIRED CONFIG COMPONENTS program_options)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 target_link_libraries(${PROJECT_NAME}

diff --git a/tools/http-client-perf/CMakeLists.txt b/tools/http-client-perf/CMakeLists.txt
@@ -2,7 +2,7 @@ project(userver-tool-http-client-perf CXX)
 
 file(GLOB_RECURSE SOURCES *.cpp)
 
-find_package(Boost REQUIRED COMPONENTS program_options)
+find_package(Boost REQUIRED CONFIG COMPONENTS program_options)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 target_link_libraries(${PROJECT_NAME}

diff --git a/tools/netcat/CMakeLists.txt b/tools/netcat/CMakeLists.txt
@@ -2,7 +2,7 @@ project(userver-tool-netcat CXX)
 
 file(GLOB_RECURSE SOURCES *.cpp)
 
-find_package(Boost REQUIRED COMPONENTS program_options)
+find_package(Boost REQUIRED CONFIG COMPONENTS program_options)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 target_link_libraries(${PROJECT_NAME}

diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
@@ -32,7 +32,7 @@ list(REMOVE_ITEM SOURCES ${UNIT_TEST_SOURCES} ${BENCH_SOURCES} ${INTERNAL_SOURCE
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
-find_package(Boost REQUIRED
+find_package(Boost REQUIRED CONFIG
     COMPONENTS
     program_options
     filesystem
@@ -41,7 +41,7 @@ find_package(Boost REQUIRED
     OPTIONAL_COMPONENTS
     stacktrace_backtrace
 )
-include(UserverRequireDWCAS)  # Should be called after `find_package(Boost REQUIRED)`
+include(UserverRequireDWCAS)  # Should be called after `find_package(Boost)`
 
 message(STATUS "boost: ${Boost_VERSION_STRING}")
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")