From 4340b459ce5961eb1221f86b04d2a8b3b0608332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 29 Oct 2019 16:46:37 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@863 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3f12d30..6abecb78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -475,21 +475,23 @@ if (NOT PIP_FREERTOS) target_link_libraries(pip_io_utils ${IO_UTILS_LIBS}) list(APPEND PIP_LIBS_TARGETS pip_io_utils) + # Concurrent module set(CONCURRENT_LIBS pip) add_library(pip_concurrent ${PIP_LIB_TYPE} ${CPP_LIB_CONCURRENT}) target_link_libraries(pip_concurrent ${CONCURRENT_LIBS}) + set_property(TARGET pip_concurrent PROPERTY CXX_STANDARD 11) list(APPEND PIP_LIBS_TARGETS pip_concurrent) + # Enable build tests for concurrent module + if(CONCURRENT_TESTING) + add_subdirectory(src_concurrent/test) + endif() + # Test program if(PIP_UTILS) add_executable(pip_test "main.cpp") target_link_libraries(pip_test pip) endif() - - # Enable build tests for module concurrent - if(CONCURRENT_TESTING) - add_subdirectory(src_concurrent/test) - endif() else(NOT PIP_FREERTOS) message(STATUS "Building PIP with crypt support")