diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-21 15:56:25 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-21 17:13:43 +0300 |
| commit | 1a4540d78b931a11d5aece6b946ede86cf9876dc (patch) | |
| tree | bab07d1c6b68d7aeb19e9e37ce8597f397961413 /server | |
| parent | cmake: install() PDB files (diff) | |
| download | math-server-1a4540d78b931a11d5aece6b946ede86cf9876dc.tar.gz math-server-1a4540d78b931a11d5aece6b946ede86cf9876dc.zip | |
cmake: use Boost::* targets
Diffstat (limited to 'server')
| -rw-r--r-- | server/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | server/main/CMakeLists.txt | 17 |
2 files changed, 7 insertions, 14 deletions
diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt index 5655861..5fe9e7f 100644 --- a/server/common/CMakeLists.txt +++ b/server/common/CMakeLists.txt @@ -1,6 +1,4 @@ find_package(Boost REQUIRED) add_library(common INTERFACE) - -target_include_directories(common SYSTEM INTERFACE ${Boost_INCLUDE_DIRS}) -target_link_libraries(common INTERFACE ${Boost_LIBRARIES}) +target_link_libraries(common INTERFACE Boost::boost) diff --git a/server/main/CMakeLists.txt b/server/main/CMakeLists.txt index 7269005..fe33cb5 100644 --- a/server/main/CMakeLists.txt +++ b/server/main/CMakeLists.txt @@ -1,25 +1,20 @@ find_package(Boost REQUIRED COMPONENTS filesystem program_options) +set(CMAKE_THREAD_PREFER_PTHREAD ON) +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) + option(DEBUG_ASIO "enable debug output for Boost.Asio" OFF) add_executable(server main.cpp server.cpp session.cpp session_manager.cpp) target_link_libraries(server PRIVATE common parser) - -target_include_directories(server SYSTEM PRIVATE ${Boost_INCLUDE_DIRS}) -target_link_libraries(server PRIVATE ${Boost_LIBRARIES}) -target_compile_definitions(server PRIVATE BOOST_DATE_TIME_NO_LIB BOOST_REGEX_NO_LIB) - -set(CMAKE_THREAD_PREFER_PTHREAD ON) -set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) -target_link_libraries(server PRIVATE Threads::Threads) +target_link_libraries(server PRIVATE Boost::disable_autolinking Boost::filesystem Boost::program_options Threads::Threads) +set_target_properties(server PROPERTIES OUTPUT_NAME math-server) if(DEBUG_ASIO) target_compile_definitions(server PRIVATE BOOST_ASIO_ENABLE_HANDLER_TRACKING) endif() -set_target_properties(server PROPERTIES OUTPUT_NAME math-server) - install(TARGETS server RUNTIME DESTINATION bin) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") install(FILES "$<TARGET_PDB_FILE:server>" DESTINATION bin OPTIONAL) |