From 354ed1ac85eeb50c6ae2f058b16a09d4fdd2f89c Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 13 Dec 2019 00:27:25 +0300 Subject: rename executables --- client/CMakeLists.txt | 3 +++ client/Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'client') 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"] -- cgit v1.2.3