mirror of
https://github.com/bolero-MURAKAMI/Sprout
synced 2024-11-12 21:09:01 +00:00
Merge pull request #90 from ryanmrichard/skip_tests
Allows tests to be skipped
This commit is contained in:
commit
c79553a652
1 changed files with 10 additions and 2 deletions
|
@ -9,7 +9,11 @@ include (FindPkgConfig)
|
||||||
include(CheckCXXSourceCompiles)
|
include(CheckCXXSourceCompiles)
|
||||||
|
|
||||||
# build type
|
# build type
|
||||||
|
if( NOT DEFINED CMAKE_BUILD_TYPE )
|
||||||
set(CMAKE_BUILD_TYPE Debug)
|
set(CMAKE_BUILD_TYPE Debug)
|
||||||
|
endif( NOT DEFINED CMAKE_BUILD_TYPE )
|
||||||
|
|
||||||
|
option( BUILD_TESTS "If true Sprout's tests will be built" TRUE)
|
||||||
|
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "-W -Wall -Wextra -Wno-unused-parameter -Werror -std=c++0x -O0 -g")
|
set(CMAKE_CXX_FLAGS_DEBUG "-W -Wall -Wextra -Wno-unused-parameter -Werror -std=c++0x -O0 -g")
|
||||||
|
@ -22,6 +26,7 @@ if( NOT DEFINED CMAKE_VERBOSE_MAKEFILE )
|
||||||
set(CMAKE_VERBOSE_MAKEFILE OFF)
|
set(CMAKE_VERBOSE_MAKEFILE OFF)
|
||||||
endif( NOT DEFINED CMAKE_VERBOSE_MAKEFILE )
|
endif( NOT DEFINED CMAKE_VERBOSE_MAKEFILE )
|
||||||
|
|
||||||
|
|
||||||
if( NOT DEFINED Boost_USE_MULTITHREADED )
|
if( NOT DEFINED Boost_USE_MULTITHREADED )
|
||||||
set(Boost_USE_MULTITHREADED ON)
|
set(Boost_USE_MULTITHREADED ON)
|
||||||
endif( NOT DEFINED Boost_USE_MULTITHREADED )
|
endif( NOT DEFINED Boost_USE_MULTITHREADED )
|
||||||
|
@ -35,5 +40,8 @@ pkg_check_modules(OpenCV opencv)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} )
|
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIRS} )
|
||||||
link_directories( ${Boost_LIBRARY_DIRS} )
|
link_directories( ${Boost_LIBRARY_DIRS} )
|
||||||
subdirs( sprout libs tools cmake )
|
subdirs( sprout tools cmake )
|
||||||
|
if( ${BUILD_TESTS} )
|
||||||
|
subdirs(libs)
|
||||||
|
endif( ${BUILD_TESTS} )
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue