From d777ca12f60f5da31b59f34605c5eb9f1608756e Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 20 Jul 2021 12:11:47 -0400
Subject: [PATCH] CMakeDependentOption: Revert "Allow parentheses in the
 depends string"

Revert commit 0665d9092e (CMakeDependentOption: Allow parentheses in the
depends string, 2021-06-13, v3.21.0-rc1~32^2).  It broke existing use
cases with parentheses in regular expressions.  Also add a test for this.

Fixes: #22447
---
 Modules/CMakeDependentOption.cmake                         | 5 +----
 Tests/RunCMake/CMakeDependentOption/Parentheses.cmake      | 7 -------
 .../{Parentheses-stdout.txt => Regex-stdout.txt}           | 0
 Tests/RunCMake/CMakeDependentOption/Regex.cmake            | 5 +++++
 Tests/RunCMake/CMakeDependentOption/RunCMakeTest.cmake     | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 Tests/RunCMake/CMakeDependentOption/Parentheses.cmake
 rename Tests/RunCMake/CMakeDependentOption/{Parentheses-stdout.txt => Regex-stdout.txt} (100%)
 create mode 100644 Tests/RunCMake/CMakeDependentOption/Regex.cmake

diff --git a/Modules/CMakeDependentOption.cmake b/Modules/CMakeDependentOption.cmake
index 0a291f24fb..96855d28f1 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)
diff --git a/Tests/RunCMake/CMakeDependentOption/Parentheses.cmake b/Tests/RunCMake/CMakeDependentOption/Parentheses.cmake
deleted file mode 100644
index c2951f1dcb..0000000000
--- a/Tests/RunCMake/CMakeDependentOption/Parentheses.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-include(CMakeDependentOption)
-
-set(A 1)
-set(B 1)
-set(C 0)
-cmake_dependent_option(USE_FOO "Use Foo" ON "A AND (B OR C)" OFF)
-message(STATUS "USE_FOO='${USE_FOO}'")
diff --git a/Tests/RunCMake/CMakeDependentOption/Parentheses-stdout.txt b/Tests/RunCMake/CMakeDependentOption/Regex-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CMakeDependentOption/Parentheses-stdout.txt
rename to Tests/RunCMake/CMakeDependentOption/Regex-stdout.txt
diff --git a/Tests/RunCMake/CMakeDependentOption/Regex.cmake b/Tests/RunCMake/CMakeDependentOption/Regex.cmake
new file mode 100644
index 0000000000..8342a01b7d
--- /dev/null
+++ b/Tests/RunCMake/CMakeDependentOption/Regex.cmake
@@ -0,0 +1,5 @@
+include(CMakeDependentOption)
+
+set(FOO "lower")
+cmake_dependent_option(USE_FOO "Use Foo" ON "FOO MATCHES (UPPER|lower)" OFF)
+message(STATUS "USE_FOO='${USE_FOO}'")
diff --git a/Tests/RunCMake/CMakeDependentOption/RunCMakeTest.cmake b/Tests/RunCMake/CMakeDependentOption/RunCMakeTest.cmake
index bbdd3e5886..e1045f2317 100644
--- a/Tests/RunCMake/CMakeDependentOption/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMakeDependentOption/RunCMakeTest.cmake
@@ -1,3 +1,3 @@
 include(RunCMake)
 
-run_cmake_script(Parentheses)
+run_cmake_script(Regex)