Merge pull request #1638 from janisozaur/patch-1

Prevent building in source dir
This commit is contained in:
Martin Hořeňovský 2019-05-25 21:15:58 +02:00 committed by GitHub
commit e28e162795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View File

@ -8,6 +8,10 @@ endif()
project(Catch2 LANGUAGES CXX VERSION 2.7.2) project(Catch2 LANGUAGES CXX VERSION 2.7.2)
if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
endif()
# Provide path for scripts # Provide path for scripts
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")

View File

@ -18,7 +18,7 @@ class CatchConan(ConanFile):
cmake.definitions["BUILD_TESTING"] = "OFF" cmake.definitions["BUILD_TESTING"] = "OFF"
cmake.definitions["CATCH_INSTALL_DOCS"] = "OFF" cmake.definitions["CATCH_INSTALL_DOCS"] = "OFF"
cmake.definitions["CATCH_INSTALL_HELPERS"] = "ON" cmake.definitions["CATCH_INSTALL_HELPERS"] = "ON"
cmake.configure() cmake.configure(build_folder='build')
cmake.install() cmake.install()
self.copy(pattern="LICENSE.txt", dst="licenses") self.copy(pattern="LICENSE.txt", dst="licenses")