diff options
author | Brad King <brad.king@kitware.com> | 2021-07-21 15:32:11 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-21 15:32:48 (GMT) |
commit | 6e04e06e673f905bc9044a62ff2152cb0f6fa52c (patch) | |
tree | 595de707ed794ba610f0a68326cf1e520f4dcedb /Modules/CMakeDependentOption.cmake | |
parent | 797aa4c410b1ca5686e1b652be43875d3a091682 (diff) | |
parent | d777ca12f60f5da31b59f34605c5eb9f1608756e (diff) | |
download | CMake-6e04e06e673f905bc9044a62ff2152cb0f6fa52c.zip CMake-6e04e06e673f905bc9044a62ff2152cb0f6fa52c.tar.gz CMake-6e04e06e673f905bc9044a62ff2152cb0f6fa52c.tar.bz2 |
Merge topic 'CMakeDependentOption-revert-parens' into release-3.21
d777ca12f6 CMakeDependentOption: Revert "Allow parentheses in the depends string"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6368
Diffstat (limited to 'Modules/CMakeDependentOption.cmake')
-rw-r--r-- | Modules/CMakeDependentOption.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Modules/CMakeDependentOption.cmake b/Modules/CMakeDependentOption.cmake index 0a291f2..96855d2 100644 --- a/Modules/CMakeDependentOption.cmake +++ b/Modules/CMakeDependentOption.cmake @@ -42,10 +42,7 @@ macro(CMAKE_DEPENDENT_OPTION option doc default depends force) if(${option}_ISSET MATCHES "^${option}_ISSET$") set(${option}_AVAILABLE 1) foreach(d ${depends}) - string(REPLACE "(" " ( " _CMAKE_CDO_DEP "${d}") - string(REPLACE ")" " ) " _CMAKE_CDO_DEP "${_CMAKE_CDO_DEP}") - string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${_CMAKE_CDO_DEP}") - unset(_CMAKE_CDO_DEP) + string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}") if(${CMAKE_DEPENDENT_OPTION_DEP}) else() set(${option}_AVAILABLE 0) |