Merge branch 'master' into dev/neilmac/spec

tests/CMakeLists.txt

@@ -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/multi_span.h ../include/span.h ../include/string_span.h)
     target_link_libraries(${name} UnitTest++)