Skip to content

Commit f8d4e95

Browse files
authored
abort when nested (bugfix) (#94)
* abort when nested (bugfix) * update error message * update error message
1 parent 4c7aa36 commit f8d4e95

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cmake/CPM.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,18 @@
2828

2929
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
3030

31-
set(CURRENT_CPM_VERSION 0.15)
31+
set(CURRENT_CPM_VERSION 0.15.1)
3232

3333
if(CPM_DIRECTORY)
3434
if(NOT ${CPM_DIRECTORY} MATCHES ${CMAKE_CURRENT_LIST_DIR})
3535
if (${CPM_VERSION} VERSION_LESS ${CURRENT_CPM_VERSION})
3636
message(AUTHOR_WARNING "${CPM_INDENT} \
37-
A dependency is using a more recent CPM (${NEW_CPM_VERSION}) than the current project (${CPM_VERSION}). \
37+
A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \
3838
It is recommended to upgrade CPM to the most recent version. \
39-
See https://github.com/TheLartians/CPM for more information."
39+
See https://github.com/TheLartians/CPM.cmake for more information."
4040
)
4141
endif()
42+
return()
4243
endif()
4344
endif()
4445

0 commit comments

Comments
 (0)