summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2018-11-05 15:58:24 +1100
committerBrad King <brad.king@kitware.com>2018-11-05 07:56:03 -0500
commit20d5e77a270639a124fea587bb68b2fb6a5356fc (patch)
treec08b444f63cad8d3b337dc21ae4684f3cd0aeba5 /Modules
parent44cc305ac12d58fe476f815b89f42288455e44a9 (diff)
downloadcmake-20d5e77a270639a124fea587bb68b2fb6a5356fc.tar.gz
CPack: Rename Ext generator to External
Ext and External were used inconsistently in the code and the docs. This change converts all uses of Ext to External, including within variable names used by the generator.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Internal/CPack/CPackExternal.cmake (renamed from Modules/Internal/CPack/CPackExt.cmake)22
1 files changed, 11 insertions, 11 deletions
diff --git a/Modules/Internal/CPack/CPackExt.cmake b/Modules/Internal/CPack/CPackExternal.cmake
index e52d978a1e..e4d055a2db 100644
--- a/Modules/Internal/CPack/CPackExt.cmake
+++ b/Modules/Internal/CPack/CPackExternal.cmake
@@ -1,15 +1,15 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
-if(NOT "${CPACK_EXT_REQUESTED_VERSIONS}" STREQUAL "")
+if(NOT "${CPACK_EXTERNAL_REQUESTED_VERSIONS}" STREQUAL "")
unset(_found_major)
- foreach(_req_version IN LISTS CPACK_EXT_REQUESTED_VERSIONS)
+ foreach(_req_version IN LISTS CPACK_EXTERNAL_REQUESTED_VERSIONS)
if(_req_version MATCHES "^([0-9]+)\\.([0-9]+)$")
set(_req_major "${CMAKE_MATCH_1}")
set(_req_minor "${CMAKE_MATCH_2}")
- foreach(_known_version IN LISTS CPACK_EXT_KNOWN_VERSIONS)
+ foreach(_known_version IN LISTS CPACK_EXTERNAL_KNOWN_VERSIONS)
string(REGEX MATCH
"^([0-9]+)\\.([0-9]+)$"
_known_version_dummy
@@ -33,21 +33,21 @@ if(NOT "${CPACK_EXT_REQUESTED_VERSIONS}" STREQUAL "")
endforeach()
if(DEFINED _found_major)
- set(CPACK_EXT_SELECTED_MAJOR "${_found_major}")
- set(CPACK_EXT_SELECTED_MINOR "${_found_minor}")
- set(CPACK_EXT_SELECTED_VERSION "${_found_major}.${_found_minor}")
+ set(CPACK_EXTERNAL_SELECTED_MAJOR "${_found_major}")
+ set(CPACK_EXTERNAL_SELECTED_MINOR "${_found_minor}")
+ set(CPACK_EXTERNAL_SELECTED_VERSION "${_found_major}.${_found_minor}")
else()
message(FATAL_ERROR
- "Could not find a suitable version in CPACK_EXT_REQUESTED_VERSIONS"
+ "Could not find a suitable version in CPACK_EXTERNAL_REQUESTED_VERSIONS"
)
endif()
else()
- list(GET CPACK_EXT_KNOWN_VERSIONS 0 CPACK_EXT_SELECTED_VERSION)
+ list(GET CPACK_EXTERNAL_KNOWN_VERSIONS 0 CPACK_EXTERNAL_SELECTED_VERSION)
string(REGEX MATCH
"^([0-9]+)\\.([0-9]+)$"
_dummy
- "${CPACK_EXT_SELECTED_VERSION}"
+ "${CPACK_EXTERNAL_SELECTED_VERSION}"
)
- set(CPACK_EXT_SELECTED_MAJOR "${CMAKE_MATCH_1}")
- set(CPACK_EXT_SELECTED_MINOR "${CMAKE_MATCH_2}")
+ set(CPACK_EXTERNAL_SELECTED_MAJOR "${CMAKE_MATCH_1}")
+ set(CPACK_EXTERNAL_SELECTED_MINOR "${CMAKE_MATCH_2}")
endif()