mirror of
https://github.com/microsoft/GSL.git
synced 2024-11-03 17:56:43 -05:00
Merge pull request #276 from sergiyor/dev/sergiyor/submodules
Making unittest-cpp a submodule.
This commit is contained in:
commit
511c2da4e0
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
tests/unittest-cpp
|
||||
CMakeFiles
|
||||
tests/CMakeFiles
|
||||
tests/Debug
|
||||
|
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
[submodule "tests/unittest-cpp"]
|
||||
path = tests/unittest-cpp
|
||||
url = https://github.com/Microsoft/unittest-cpp.git
|
@ -56,7 +56,6 @@ install:
|
||||
|
||||
before_script:
|
||||
- cd ${TRAVIS_BUILD_DIR}
|
||||
- git clone --depth 1 https://github.com/Microsoft/unittest-cpp tests/unittest-cpp
|
||||
- cmake -H. -Bb -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_INSTALL_PREFIX=$PWD/o -DCMAKE_BUILD_TYPE=$BUILD_TYPE
|
||||
- cmake --build b
|
||||
|
||||
|
@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 2.8.7)
|
||||
|
||||
project(GSLTests CXX)
|
||||
|
||||
if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/unittest-cpp/tests)
|
||||
execute_process(COMMAND git submodule update --init WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
endif()
|
||||
|
||||
add_subdirectory(unittest-cpp)
|
||||
|
||||
include_directories(
|
||||
@ -28,10 +32,6 @@ else()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/unittest-cpp)
|
||||
message(FATAL_ERROR "Could not find unittest-cpp enlistment. Please run 'git clone https://github.com/Microsoft/unittest-cpp.git unittest-cpp' in the tests directory")
|
||||
endif()
|
||||
|
||||
function(add_gsl_test name)
|
||||
add_executable(${name} ${name}.cpp ../include/gsl.h ../include/gsl_assert.h ../include/gsl_util.h ../include/span.h ../include/string_span.h)
|
||||
target_link_libraries(${name} UnitTest++)
|
||||
|
1
tests/unittest-cpp
Submodule
1
tests/unittest-cpp
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit dc6b90838014ab985bf3cd74ac17ad9d00e1fbcb
|
Loading…
Reference in New Issue
Block a user