Share testing library for all project
git-svn-id: svn://db.shs.com.ru/pip@873 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -19,6 +19,7 @@ option(INTROSPECTION "Build with introspection" OFF)
|
||||
option(LIB "System install" ON)
|
||||
option(STATIC_LIB OFF)
|
||||
option(DEBUG "Build with -g3" OFF)
|
||||
option(TESTS "Build tests and perform their before install step" OFF)
|
||||
set(PIP_UTILS 1)
|
||||
if(LIBPROJECT)
|
||||
set(PIP_UTILS ${UTILS})
|
||||
@@ -221,6 +222,10 @@ else()
|
||||
message(STATUS "Building PIP release version")
|
||||
endif()
|
||||
|
||||
if (TESTS)
|
||||
include(DownloadGTest.cmake)
|
||||
option(CONCURRENT_TESTS "Enable tests for concurrent library" ON)
|
||||
endif()
|
||||
|
||||
# Check if std::iostream operators support
|
||||
if(STD_IOSTREAM)
|
||||
@@ -487,7 +492,7 @@ if (NOT PIP_FREERTOS)
|
||||
list(APPEND PIP_LIBS_TARGETS pip_concurrent)
|
||||
|
||||
# Enable build tests for concurrent module
|
||||
if(CONCURRENT_TESTING)
|
||||
if(CONCURRENT_TESTS)
|
||||
add_subdirectory(src_concurrent/test)
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user