From 86e4f964bc5a9c98a334be9f2f49082729fff85d Mon Sep 17 00:00:00 2001 From: Gianluca Sforna Date: Fri, 8 Mar 2019 14:18:22 +0100 Subject: [PATCH] allow using system's catch2 for tests (#2327) --- External/catch/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/External/catch/CMakeLists.txt b/External/catch/CMakeLists.txt index 5ad83a827..91d9ffa87 100644 --- a/External/catch/CMakeLists.txt +++ b/External/catch/CMakeLists.txt @@ -3,7 +3,8 @@ add_custom_target(catch ALL) if(NOT DEFINED CATCH_DIR) set(CATCH_DIR "${CMAKE_CURRENT_SOURCE_DIR}/catch") endif() -if(NOT EXISTS "${CATCH_DIR}/single_include") +if(NOT EXISTS "${CATCH_DIR}/catch.hpp") + message("-- Catch not found in ${CATCH_DIR}") include(RDKitUtils) set(RELEASE_NO "2.1.2") downloadAndCheckMD5("https://github.com/catchorg/Catch2/archive/v${RELEASE_NO}.tar.gz" @@ -13,8 +14,9 @@ if(NOT EXISTS "${CATCH_DIR}/single_include") ${CMAKE_CURRENT_SOURCE_DIR}/master.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) file(RENAME "Catch2-${RELEASE_NO}" "${CATCH_DIR}") + set(CATCH_INCLUDE_DIR "${CATCH_DIR}/single_include" PARENT_SCOPE) else() - message("-- Found Catch2 source in ${CATCH_DIR}") + message("-- Found Catch2: ${CATCH_DIR}") + set(CATCH_INCLUDE_DIR "${CATCH_DIR}" PARENT_SCOPE) endif() -set(CATCH_INCLUDE_DIR "${CATCH_DIR}/single_include" PARENT_SCOPE)