diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 10:07:24 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-09 10:33:30 +0300 |
| commit | faa36614b9b0444faa25534f55fe3d5959ed3302 (patch) | |
| tree | 705928671fb565e4e6de4020002dc8d5c1418406 | |
| parent | use CMake's install() for predictable paths (diff) | |
| download | math-server-faa36614b9b0444faa25534f55fe3d5959ed3302.tar.gz math-server-faa36614b9b0444faa25534f55fe3d5959ed3302.zip | |
link to pthreads in CMakeLists.txt
| -rwxr-xr-x | .travis/build.sh | 1 | ||||
| -rw-r--r-- | client/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | client/Dockerfile | 1 | ||||
| -rw-r--r-- | server/Dockerfile | 1 | ||||
| -rw-r--r-- | server/main/CMakeLists.txt | 5 |
5 files changed, 10 insertions, 3 deletions
diff --git a/.travis/build.sh b/.travis/build.sh index 021ec97..eeeec17 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -14,7 +14,6 @@ main() { cd -- "$build_dir" cmake \ -D "CMAKE_BUILD_TYPE=$build_type" \ - -D "CMAKE_CXX_STANDARD_LIBRARIES=-lpthread" \ -D "CMAKE_INSTALL_PREFIX=$install_dir" \ -D "BOOST_ROOT=$boost_dir" \ -D "BOOST_LIBRARYDIR=$boost_librarydir" \ diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 6bebf27..c76eba3 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -5,4 +5,9 @@ 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) +set(CMAKE_THREAD_PREFER_PTHREAD ON) +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) +target_link_libraries(client PRIVATE Threads::Threads) + install(TARGETS client RUNTIME DESTINATION bin) diff --git a/client/Dockerfile b/client/Dockerfile index ab1424b..a2408cf 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -22,7 +22,6 @@ WORKDIR /tmp/build RUN cmake -G "Unix Makefiles" \ -D CMAKE_BUILD_TYPE=RelWithDebInfo \ - -D CMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \ -D ENABLE_TESTS=ON \ /tmp/src && \ cmake --build test && \ diff --git a/server/Dockerfile b/server/Dockerfile index 951937e..cf95119 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -22,7 +22,6 @@ WORKDIR /tmp/build RUN cmake -G "Unix Makefiles" \ -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \ -D ENABLE_TESTS=ON \ /tmp/src && \ cmake --build test && \ diff --git a/server/main/CMakeLists.txt b/server/main/CMakeLists.txt index eefb969..d1d06b0 100644 --- a/server/main/CMakeLists.txt +++ b/server/main/CMakeLists.txt @@ -9,6 +9,11 @@ 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) + if(DEBUG_ASIO) target_compile_definitions(server PRIVATE BOOST_ASIO_ENABLE_HANDLER_TRACKING) endif() |