cleanup cmake boost deps

youyuanwu · Sep 11, 2022 · 3ec6862 · 3ec6862
1 parent a5b73c0
commit 3ec6862
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,13 +2,6 @@ cmake_minimum_required(VERSION 3.14)
 
 project(winasio)
 
-# format
-include(cmake/clang-format.cmake)
-if(WINASIO_CI_FORMAT)
-    message(STATUS "Only added format target.")
-    return()
-endif()
-
 set(winasio_MAIN_PROJECT OFF)
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(winasio_MAIN_PROJECT ON)
@@ -17,21 +10,34 @@ endif()
 option(winasio_BuildTests     "Build the unit tests when BUILD_TESTING is enabled." ${winasio_MAIN_PROJECT})
 option(winasio_BuildExamples  "Build examples"                                      ${winasio_MAIN_PROJECT})
 
+# format
+if(${winasio_MAIN_PROJECT})
+include(cmake/clang-format.cmake)
+if(WINASIO_CI_FORMAT)
+    message(STATUS "Only added format target.")
+    return()
+endif()
+endif(${winasio_MAIN_PROJECT})
+
+
 set(Boost_USE_STATIC_LIBS ON) # use static boost
 find_package(Boost REQUIRED COMPONENTS log) # log is used for tests
 
 add_library(winasio INTERFACE)
 target_include_directories(winasio INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${Boost_INCLUDE_DIR}
 )
 
 # header only
 target_compile_definitions(winasio
-    INTERFACE BOOST_ALL_NO_LIB=1
     INTERFACE _WIN32_WINNT=0x0601
 )
 
+# currently winasio uses boost log for logging
+target_link_libraries(winasio
+    INTERFACE Boost::log Boost::disable_autolinking Boost::headers
+)
+
 if(winasio_BuildExamples)
     add_subdirectory(examples)
 endif()

diff --git a/tests/http/CMakeLists.txt b/tests/http/CMakeLists.txt
@@ -15,7 +15,7 @@ foreach(test_file ${SOURCES})
     target_include_directories(${test_name} 
       PRIVATE .
     )
-    target_link_libraries(${test_name} PRIVATE gtest_main winasio ${Boost_LIBRARIES})
+    target_link_libraries(${test_name} PRIVATE gtest_main winasio)
     set_property(TARGET ${test_name} PROPERTY CXX_STANDARD 20) # for semaphore
     add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 endforeach()
diff --git a/tests/http/http_server_test.cpp b/tests/http/http_server_test.cpp
@@ -9,6 +9,10 @@
 #include <boost/beast/http.hpp>
 #include <boost/beast/version.hpp>
 
+#include <boost/log/core.hpp>
+#include <boost/log/expressions.hpp>
+#include <boost/log/trivial.hpp>
+
 #include <cstdio>
 #include <utility>
 
@@ -17,7 +21,15 @@ namespace http = beast::http;   // from <boost/beast/http.hpp>
 namespace net = boost::asio;    // from <boost/asio.hpp>
 using tcp = net::ip::tcp;       // from <boost/asio/ip/tcp.hpp>
 
+namespace logging = boost::log;
+
+void log_init() {
+  logging::core::get()->set_filter(logging::trivial::severity >=
+                                   logging::trivial::debug);
+}
+
 TEST(HTTPServer, server) {
+  log_init();
   // init http module
   winnet::http::http_initializer init;
   // add https then this becomes https server
@@ -39,7 +51,7 @@ TEST(HTTPServer, server) {
     BOOST_LOG_TRIVIAL(debug)
         << L"Got a request for url: " << req->CookedUrl.pFullUrl << L" VerbId: "
         << static_cast<int>(req->Verb);
-    std::cout << request << std::endl;
+    BOOST_LOG_TRIVIAL(debug) << request;
     response.set_status_code(200);
     response.set_reason("OK");
     response.set_content_type("text/html");

diff --git a/tests/winhttp/CMakeLists.txt b/tests/winhttp/CMakeLists.txt
@@ -9,7 +9,7 @@ foreach(test_file ${SOURCES})
     target_include_directories(${test_name} 
       PRIVATE .
     )
-    target_link_libraries(${test_name} PRIVATE gtest_main winasio ${Boost_LIBRARIES})
+    target_link_libraries(${test_name} PRIVATE gtest_main winasio)
     set_property(TARGET ${test_name} PROPERTY CXX_STANDARD 20) # for semaphore
     add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 endforeach()