Merge branch 'master' of github.com:philsquared/Catch

# By Aaron Simmons
# Via Aaron Simmons (1) and Phil Nash (1)
* 'master' of github.com:philsquared/Catch:
  GIT_EXECUTABLE undefined
This commit is contained in:
Phil Nash 2014-04-21 19:03:19 +01:00
commit 6da62d21f5

View File

@ -8,6 +8,7 @@ You can use the following CMake script to automatically fetch Catch from github
cmake_minimum_required(VERSION 2.8.8) cmake_minimum_required(VERSION 2.8.8)
project(catch_builder CXX) project(catch_builder CXX)
include(ExternalProject) include(ExternalProject)
find_package(Git REQUIRED)
ExternalProject_Add( ExternalProject_Add(
catch catch
@ -33,4 +34,4 @@ If you put it in, e.g., `${PROJECT_SRC_DIR}/${EXT_PROJECTS_DIR}/catch/`, you can
add_subdirectory(${EXT_PROJECTS_DIR}/catch) add_subdirectory(${EXT_PROJECTS_DIR}/catch)
include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES}) include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
enable_testing(true) # Enables unit-testing. enable_testing(true) # Enables unit-testing.
``` ```