diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | client/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/Dockerfile | 4 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | server/Dockerfile | 4 | ||||
| -rw-r--r-- | server/main/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/unit_tests/CMakeLists.txt | 4 |
8 files changed, 15 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index d4a57a9..b1f6b8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,4 +29,4 @@ script: --boost "$HOME/boost_1_71_0" \ --boost-librarydir "$HOME/boost_1_71_0/stage/$platform/${configuration,,}/lib" \ -- -DENABLE_TESTS=ON - - "$HOME/install/bin/test/unit_tests" + - "$HOME/install/bin/math-server-unit-tests" diff --git a/appveyor.yml b/appveyor.yml index 71b270e..6e0bbc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ after_build: - appveyor.exe PushArtifact "math-server-%PLATFORM%-%CONFIGURATION%.zip" test_script: - - '"%install_dir%\bin\test\unit_tests.exe"' + - '"%install_dir%\bin\math-server-unit-tests.exe"' for: # Only build Release builds for master to speed things up: diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index c76eba3..c6016b5 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,6 +1,7 @@ find_package(Boost REQUIRED COMPONENTS filesystem program_options) add_executable(client main.cpp) + target_include_directories(client SYSTEM PRIVATE ${Boost_INCLUDE_DIRS}) target_link_libraries(client PRIVATE ${Boost_LIBRARIES}) target_compile_definitions(client PRIVATE BOOST_DATE_TIME_NO_LIB BOOST_REGEX_NO_LIB) @@ -10,4 +11,6 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) target_link_libraries(client PRIVATE Threads::Threads) +set_target_properties(client PROPERTIES OUTPUT_NAME math-client) + install(TARGETS client RUNTIME DESTINATION bin) diff --git a/client/Dockerfile b/client/Dockerfile index a447ab8..2bbc81a 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -27,7 +27,7 @@ RUN "$src_dir/cmake/build/build.py" \ --clean \ --configuration Release \ -- -DENABLE_TESTS=ON \ - && /usr/local/bin/test/unit_tests --log_level=all + && /usr/local/bin/math-server-unit-tests --log_level=all -ENTRYPOINT ["/usr/local/bin/client"] +ENTRYPOINT ["/usr/local/bin/math-client"] CMD ["-c", "2 * 2"] diff --git a/docker-compose.yml b/docker-compose.yml index 79c4a05..0514108 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,5 +14,5 @@ services: build: context: . dockerfile: client/Dockerfile - entrypoint: ["/usr/local/bin/client", "-H", "server"] + entrypoint: ["/usr/local/bin/math-client", "-H", "server"] image: egortensin/math-client diff --git a/server/Dockerfile b/server/Dockerfile index 9c9adea..322c07f 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -27,6 +27,6 @@ RUN "$src_dir/cmake/build/build.py" \ --clean \ --configuration Release \ -- -DENABLE_TESTS=ON \ - && /usr/local/bin/test/unit_tests --log_level=all + && /usr/local/bin/math-server-unit-tests --log_level=all -CMD ["/usr/local/bin/server"] +CMD ["/usr/local/bin/math-server"] diff --git a/server/main/CMakeLists.txt b/server/main/CMakeLists.txt index d1d06b0..25ca7be 100644 --- a/server/main/CMakeLists.txt +++ b/server/main/CMakeLists.txt @@ -18,4 +18,6 @@ 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) diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt index 43530f1..d212db6 100644 --- a/test/unit_tests/CMakeLists.txt +++ b/test/unit_tests/CMakeLists.txt @@ -7,4 +7,6 @@ target_include_directories(unit_tests PRIVATE ../..) target_include_directories(unit_tests SYSTEM PRIVATE ${Boost_INCLUDE_DIRS}) target_link_libraries(unit_tests PRIVATE ${Boost_LIBRARIES}) -install(TARGETS unit_tests RUNTIME DESTINATION bin/test) +set_target_properties(unit_tests PROPERTIES OUTPUT_NAME math-server-unit-tests) + +install(TARGETS unit_tests RUNTIME DESTINATION bin) |