kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #23100
[PATCH 11/19] FindwxWidgets.cmake: Simplify MATCHES
Arbitrary characters at beginning and end of the line are implicitly allowed anyway
---
CMakeModules/FindwxWidgets.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeModules/FindwxWidgets.cmake b/CMakeModules/FindwxWidgets.cmake
index 8ac93f3..eca3466 100644
--- a/CMakeModules/FindwxWidgets.cmake
+++ b/CMakeModules/FindwxWidgets.cmake
@@ -530,7 +530,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
if(WX_LIB_DIR)
# If building shared libs, define WXUSINGDLL to use dllimport.
- if(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+ if(WX_LIB_DIR MATCHES "[dD][lL][lL]")
set(wxWidgets_DEFINITIONS WXUSINGDLL)
DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
endif()
@@ -638,7 +638,7 @@ else()
if(_wx_result EQUAL 0)
foreach(_opt_name debug static unicode universal)
string(TOUPPER ${_opt_name} _upper_opt_name)
- if(_wx_selected_config MATCHES ".*${_opt_name}.*")
+ if(_wx_selected_config MATCHES "${_opt_name}")
set(wxWidgets_DEFAULT_${_upper_opt_name} ON)
else()
set(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
Follow ups
References
-
[PATCH 00/19] FindwxWidgets.cmake updates
From: Simon Richter, 2016-02-13
-
[PATCH 01/19] FindwxWidgets.cmake: Remove arguments from else() and end*()
From: Simon Richter, 2016-02-13
-
[PATCH 02/19] FindwxWidgets.cmake: remove a few dbg_msg() invocations
From: Simon Richter, 2016-02-13
-
[PATCH 03/19] FindwxWidgets.cmake: Use uppercase for DBG_MSG macro
From: Simon Richter, 2016-02-13
-
[PATCH 04/19] FindwxWidgets.cmake: Show line number in debug output
From: Simon Richter, 2016-02-13
-
[PATCH 05/19] FindwxWidgets.cmake: Use uppercase for macro names
From: Simon Richter, 2016-02-13
-
[PATCH 06/19] FindwxWidgets.cmake: Use lowercase for CMake builtins
From: Simon Richter, 2016-02-13
-
[PATCH 07/19] FindwxWidgets.cmake: Fix indentation
From: Simon Richter, 2016-02-13
-
[PATCH 08/19] FindwxWidgets.cmake: Look for versioned wx-config scripts
From: Simon Richter, 2016-02-13
-
[PATCH 09/19] FindwxWidgets.cmake: documentation for variables
From: Simon Richter, 2016-02-13
-
[PATCH 10/19] FindwxWidgets.cmake: Expect directory layout for MSVC 64 bit
From: Simon Richter, 2016-02-13