diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
index 6fdef5ca44..eb9890b476 100644
--- a/build/cmake/config.cmake
+++ b/build/cmake/config.cmake
@@ -137,15 +137,12 @@ function(wx_write_config)
     set(STD_BASE_LIBS_ALL xml net base)
     set(STD_GUI_LIBS_ALL xrc html qa adv core)
     foreach(lib IN ITEMS xrc webview stc richtext ribbon propgrid aui gl media html qa adv core xml net base)
-        list(FIND wxLIB_TARGETS wx${lib} hasLib)
-        if (hasLib GREATER -1)
+        if (wx${lib} IN_LIST wxLIB_TARGETS)
             wx_string_append(BUILT_WX_LIBS "${lib} ")
-            list(FIND STD_BASE_LIBS_ALL ${lib} index)
-            if (index GREATER -1)
+            if (${lib} IN_LIST STD_BASE_LIBS_ALL)
                 wx_string_append(STD_BASE_LIBS "${lib} ")
             endif()
-            list(FIND STD_GUI_LIBS_ALL ${lib} index)
-            if (index GREATER -1)
+            if (${lib} IN_LIST STD_GUI_LIBS_ALL)
                 wx_string_append(STD_GUI_LIBS "${lib} ")
             endif()
         endif()
diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in
index a67ad494bc..85e3e004bd 100644
--- a/build/cmake/wxWidgetsConfig.cmake.in
+++ b/build/cmake/wxWidgetsConfig.cmake.in
@@ -81,17 +81,16 @@ foreach(libname @wxLIB_TARGETS@)
         # use the Release configuration for MinSizeRel and RelWithDebInfo configurations
         # only when Release target exists, and MinSizeRel/RelWithDebInfo doesn't exist
         get_target_property(configs wx::${libname} IMPORTED_CONFIGURATIONS)
-        list(FIND configs "RELEASE" idxSrc)
-        if(idxSrc GREATER -1)
-            list(FIND configs "MINSIZEREL" idxSrc)
-            list(FIND CMAKE_CONFIGURATION_TYPES "MinSizeRel" idxDst)
-            if(idxSrc EQUAL -1 AND (idxDst GREATER -1 OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel"))
-                set_target_properties(wx::${libname} PROPERTIES MAP_IMPORTED_CONFIG_MINSIZEREL "Release")
+        if("RELEASE" IN_LIST configs)
+            if(NOT "MINSIZEREL" IN_LIST configs)
+                if("MinSizeRel" IN_LIST CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+                    set_target_properties(wx::${libname} PROPERTIES MAP_IMPORTED_CONFIG_MINSIZEREL "Release")
+                endif()
             endif()
-            list(FIND configs "RELWITHDEBINFO" idxSrc)
-            list(FIND CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" idxDst)
-            if(idxSrc EQUAL -1 AND (idxDst GREATER -1 OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
-                set_target_properties(wx::${libname} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO "Release")
+            if(NOT "RELWITHDEBINFO" IN_LIST configs)
+                if("RelWithDebInfo" IN_LIST CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+                    set_target_properties(wx::${libname} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO "Release")
+                endif()
             endif()
         endif()
 
@@ -117,8 +116,7 @@ foreach(libname @wxLIB_TARGETS@)
         endif()
 
         # add to FindwxWidgets variable
-        list(FIND @PROJECT_NAME@_FIND_COMPONENTS ${name} idx)
-        if(NOT @PROJECT_NAME@_FIND_COMPONENTS OR idx GREATER -1)
+        if(NOT @PROJECT_NAME@_FIND_COMPONENTS OR ${name} IN_LIST @PROJECT_NAME@_FIND_COMPONENTS)
             list(APPEND wxWidgets_LIBRARIES wx::${name})
             if(CREATE_WX_TARGET)
                 target_link_libraries(wxWidgets::wxWidgets INTERFACE wx::${name})