para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow to use system version of the catch test framework (#549)

Browse Source
This commit is contained in:
Nicholas Guriev 2017-08-17 06:00:30 +04:00 committed by Neil MacIntosh
parent 80aa4b0c54
commit e249f861e3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.1.3)
project(GSL CXX) project(GSL CXX)
include(ExternalProject) include(ExternalProject)
find_package(Git REQUIRED) find_package(Git)
# creates a library GSL which is an interface (header files only) # creates a library GSL which is an interface (header files only)
add_library(GSL INTERFACE) add_library(GSL INTERFACE)

11
tests/CMakeLists.txt
View File

@ -10,8 +10,9 @@ list(APPEND CATCH_CMAKE_ARGS
"-DNO_SELFTEST=true" "-DNO_SELFTEST=true"
) )
# add catch if(GIT_FOUND)
ExternalProject_Add( # add catch
ExternalProject_Add(
catch catch
PREFIX ${CMAKE_BINARY_DIR}/catch PREFIX ${CMAKE_BINARY_DIR}/catch
GIT_REPOSITORY https://github.com/philsquared/Catch.git GIT_REPOSITORY https://github.com/philsquared/Catch.git
@ -19,7 +20,11 @@ ExternalProject_Add(
CMAKE_ARGS ${CATCH_CMAKE_ARGS} CMAKE_ARGS ${CATCH_CMAKE_ARGS}
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
UPDATE_DISCONNECTED 1 UPDATE_DISCONNECTED 1
) )
else()
# assume catch is installed in a system directory
add_custom_target(catch)
endif()
# this interface adds compile options to how the tests are run # this interface adds compile options to how the tests are run
# please try to keep entries ordered =) # please try to keep entries ordered =)