git-svn-id: svn://db.shs.com.ru/pip@863 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -475,21 +475,23 @@ if (NOT PIP_FREERTOS)
|
|||||||
target_link_libraries(pip_io_utils ${IO_UTILS_LIBS})
|
target_link_libraries(pip_io_utils ${IO_UTILS_LIBS})
|
||||||
list(APPEND PIP_LIBS_TARGETS pip_io_utils)
|
list(APPEND PIP_LIBS_TARGETS pip_io_utils)
|
||||||
|
|
||||||
|
# Concurrent module
|
||||||
set(CONCURRENT_LIBS pip)
|
set(CONCURRENT_LIBS pip)
|
||||||
add_library(pip_concurrent ${PIP_LIB_TYPE} ${CPP_LIB_CONCURRENT})
|
add_library(pip_concurrent ${PIP_LIB_TYPE} ${CPP_LIB_CONCURRENT})
|
||||||
target_link_libraries(pip_concurrent ${CONCURRENT_LIBS})
|
target_link_libraries(pip_concurrent ${CONCURRENT_LIBS})
|
||||||
|
set_property(TARGET pip_concurrent PROPERTY CXX_STANDARD 11)
|
||||||
list(APPEND PIP_LIBS_TARGETS pip_concurrent)
|
list(APPEND PIP_LIBS_TARGETS pip_concurrent)
|
||||||
|
|
||||||
|
# Enable build tests for concurrent module
|
||||||
|
if(CONCURRENT_TESTING)
|
||||||
|
add_subdirectory(src_concurrent/test)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Test program
|
# Test program
|
||||||
if(PIP_UTILS)
|
if(PIP_UTILS)
|
||||||
add_executable(pip_test "main.cpp")
|
add_executable(pip_test "main.cpp")
|
||||||
target_link_libraries(pip_test pip)
|
target_link_libraries(pip_test pip)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Enable build tests for module concurrent
|
|
||||||
if(CONCURRENT_TESTING)
|
|
||||||
add_subdirectory(src_concurrent/test)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
else(NOT PIP_FREERTOS)
|
else(NOT PIP_FREERTOS)
|
||||||
message(STATUS "Building PIP with crypt support")
|
message(STATUS "Building PIP with crypt support")
|
||||||
|
|||||||
Reference in New Issue
Block a user