Merge topic 'CMakeDependentOption-revert-parens' into release-3.21

d777ca12f6 CMakeDependentOption: Revert "Allow parentheses in the depends string"

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6368

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)

Tests/RunCMake/CMakeDependentOption/Parentheses.cmake

@@ -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}'")

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}'")

Tests/RunCMake/CMakeDependentOption/RunCMakeTest.cmake

@@ -1,3 +1,3 @@
 include(RunCMake)
 
-run_cmake_script(Parentheses)
+run_cmake_script(Regex)