diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -1,4 +1,8 @@ -add_subdirectory(source-control-tools) +option(BUILD_SOURCE_CONTROL_TOOLS "Build the source control tools" OFF) +if(BUILD_SOURCE_CONTROL_TOOLS) + add_subdirectory(source-control-tools) +endif() + add_subdirectory(devtools) include(PackageHelper) diff --git a/contrib/source-control-tools/CMakeLists.txt b/contrib/source-control-tools/CMakeLists.txt --- a/contrib/source-control-tools/CMakeLists.txt +++ b/contrib/source-control-tools/CMakeLists.txt @@ -2,10 +2,11 @@ add_custom_target(check-source-control-tools) -find_program(BASH_EXECUTABLE bash) +include(DoOrFail) +find_program_or_fail(BASH_EXECUTABLE bash) set(SOURCE_CONTROL_TOOLS_TESTS - ./test/test-autopatch.sh + test/test-autopatch.sh ) foreach(TEST ${SOURCE_CONTROL_TOOLS_TESTS})