Merge pull request #276 from sergiyor/dev/sergiyor/submodules

Making unittest-cpp a submodule.
This commit is contained in:
Neil MacIntosh 2016-03-24 17:06:52 -07:00
commit 511c2da4e0
5 changed files with 8 additions and 6 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
tests/unittest-cpp
CMakeFiles CMakeFiles
tests/CMakeFiles tests/CMakeFiles
tests/Debug tests/Debug

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "tests/unittest-cpp"]
path = tests/unittest-cpp
url = https://github.com/Microsoft/unittest-cpp.git

View File

@ -56,7 +56,6 @@ install:
before_script: before_script:
- cd ${TRAVIS_BUILD_DIR} - 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 -H. -Bb -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_INSTALL_PREFIX=$PWD/o -DCMAKE_BUILD_TYPE=$BUILD_TYPE
- cmake --build b - cmake --build b

View File

@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 2.8.7)
project(GSLTests CXX) 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) add_subdirectory(unittest-cpp)
include_directories( include_directories(
@ -28,10 +32,6 @@ else()
endif() endif()
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) 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) 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++) target_link_libraries(${name} UnitTest++)

1
tests/unittest-cpp Submodule

@ -0,0 +1 @@
Subproject commit dc6b90838014ab985bf3cd74ac17ad9d00e1fbcb