diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-07 00:26:56 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-07 00:36:07 +0300 |
| commit | f1d749e3cd3aaa5ec875ea29ca010b73d3174f2c (patch) | |
| tree | d0231b9283ea744223964d2f9d4e994dd165d96e /server | |
| parent | cmake: check CTest tests output (diff) | |
| download | math-server-f1d749e3cd3aaa5ec875ea29ca010b73d3174f2c.tar.gz math-server-f1d749e3cd3aaa5ec875ea29ca010b73d3174f2c.zip | |
cmake: slight CMakeLists.txt refactoring
Diffstat (limited to 'server')
| -rw-r--r-- | server/common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | server/lexer/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | server/main/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | server/parser/CMakeLists.txt | 1 |
4 files changed, 10 insertions, 15 deletions
diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt index f3d6605..77e35f0 100644 --- a/server/common/CMakeLists.txt +++ b/server/common/CMakeLists.txt @@ -1,5 +1,5 @@ +find_package(Boost REQUIRED) + add_library(common INTERFACE) target_include_directories(common INTERFACE ..) - -find_package(Boost REQUIRED) -target_link_libraries(common INTERFACE Boost::boost) +target_link_libraries(common INTERFACE Boost::disable_autolinking Boost::boost) diff --git a/server/lexer/CMakeLists.txt b/server/lexer/CMakeLists.txt index 68914d9..1f053a6 100644 --- a/server/lexer/CMakeLists.txt +++ b/server/lexer/CMakeLists.txt @@ -1,8 +1,7 @@ +find_package(Boost REQUIRED COMPONENTS regex) + file(GLOB_RECURSE lexer_src "*.cpp" "*.hpp") add_library(lexer ${lexer_src}) target_include_directories(lexer PUBLIC ..) - target_link_libraries(lexer PUBLIC common) - -find_package(Boost REQUIRED COMPONENTS regex) target_link_libraries(lexer PRIVATE Boost::disable_autolinking Boost::regex) diff --git a/server/main/CMakeLists.txt b/server/main/CMakeLists.txt index 22853a7..da5d8b9 100644 --- a/server/main/CMakeLists.txt +++ b/server/main/CMakeLists.txt @@ -1,3 +1,8 @@ +find_package(Boost 1.66.0 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) file(GLOB server_src "*.cpp" "*.hpp") @@ -6,19 +11,11 @@ set_target_properties(server PROPERTIES OUTPUT_NAME math-server) if(DEBUG_ASIO) target_compile_definitions(server PRIVATE BOOST_ASIO_ENABLE_HANDLER_TRACKING) endif() - target_link_libraries(server PRIVATE common parser) - -set(CMAKE_THREAD_PREFER_PTHREAD ON) -set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) target_link_libraries(server PRIVATE Threads::Threads) - -find_package(Boost 1.66.0 REQUIRED COMPONENTS filesystem program_options) target_link_libraries(server PRIVATE Boost::disable_autolinking Boost::filesystem Boost::program_options) - install(TARGETS server RUNTIME DESTINATION bin) install_pdbs(TARGETS server DESTINATION bin) diff --git a/server/parser/CMakeLists.txt b/server/parser/CMakeLists.txt index a426c6a..27b4153 100644 --- a/server/parser/CMakeLists.txt +++ b/server/parser/CMakeLists.txt @@ -1,4 +1,3 @@ add_library(parser INTERFACE) target_include_directories(parser INTERFACE ..) - target_link_libraries(parser INTERFACE common lexer) |