From f8d4e959bbbb5840c17f1a7c21d1334fe0a3d436 Mon Sep 17 00:00:00 2001 From: Lars Melchior Date: Fri, 25 Oct 2019 20:52:22 +0200 Subject: [PATCH] abort when nested (bugfix) (#94) * abort when nested (bugfix) * update error message * update error message --- cmake/CPM.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index b47bcae..a6e9301 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -28,17 +28,18 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR) -set(CURRENT_CPM_VERSION 0.15) +set(CURRENT_CPM_VERSION 0.15.1) if(CPM_DIRECTORY) if(NOT ${CPM_DIRECTORY} MATCHES ${CMAKE_CURRENT_LIST_DIR}) if (${CPM_VERSION} VERSION_LESS ${CURRENT_CPM_VERSION}) message(AUTHOR_WARNING "${CPM_INDENT} \ -A dependency is using a more recent CPM (${NEW_CPM_VERSION}) than the current project (${CPM_VERSION}). \ +A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \ It is recommended to upgrade CPM to the most recent version. \ -See https://github.com/TheLartians/CPM for more information." +See https://github.com/TheLartians/CPM.cmake for more information." ) endif() + return() endif() endif()