CMake: Apply source groups using a function

This will add source groups to all projects, not only libraries. And there is no need anymore to include it in every project file.
2022-04-11 23:18:58 +02:00
parent 7683219f90
commit d61c9ee4bf
20 changed files with 22 additions and 51 deletions
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -157,6 +157,7 @@ function(wx_set_common_target_properties target_name)
            set_target_properties(${target_name} PROPERTIES LINK_FLAGS "-pthread")
        endif()
    endif()
+    wx_set_source_groups()
 endfunction()

 # Set common properties on wx library target
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../source_groups.cmake)
-
 if(wxBUILD_MONOLITHIC)
    # Initialize variables for monolithic build
    set(wxMONO_SRC_FILES)
--- a/build/cmake/lib/adv/CMakeLists.txt
+++ b/build/cmake/lib/adv/CMakeLists.txt
@@ -7,6 +7,4 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_add_library(wxadv "${wxSOURCE_DIR}/src/common/dummy.cpp")
--- a/build/cmake/lib/aui/CMakeLists.txt
+++ b/build/cmake/lib/aui/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(AUI_FILES AUI_CMN)

 if(WXMSW)
--- a/build/cmake/lib/base/CMakeLists.txt
+++ b/build/cmake/lib/base/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(BASE_FILES BASE_CMN)
 wx_append_sources(BASE_FILES BASE_AND_GUI_CMN)

--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(CORE_SRC GUI_CMN)
 wx_append_sources(CORE_SRC BASE_AND_GUI_CMN)
 if(WIN32)
--- a/build/cmake/lib/gl/CMakeLists.txt
+++ b/build/cmake/lib/gl/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(GL_FILES OPENGL_CMN)

 if(WXMSW)
--- a/build/cmake/lib/html/CMakeLists.txt
+++ b/build/cmake/lib/html/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(HTML_FILES HTML_CMN)

 if(WIN32 OR wxUSE_LIBMSPACK)
--- a/build/cmake/lib/media/CMakeLists.txt
+++ b/build/cmake/lib/media/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(MEDIA_FILES MEDIA_CMN)

 if(WXMSW)
--- a/build/cmake/lib/net/CMakeLists.txt
+++ b/build/cmake/lib/net/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(NET_FILES NET_CMN)

 if(WIN32)
--- a/build/cmake/lib/propgrid/CMakeLists.txt
+++ b/build/cmake/lib/propgrid/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(PROPGRID_FILES PROPGRID)

 wx_add_library(wxpropgrid ${PROPGRID_FILES})
--- a/build/cmake/lib/qa/CMakeLists.txt
+++ b/build/cmake/lib/qa/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(QA_FILES QA)

 wx_add_library(wxqa ${QA_FILES})
--- a/build/cmake/lib/ribbon/CMakeLists.txt
+++ b/build/cmake/lib/ribbon/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(RIBBON_FILES RIBBON)

 wx_add_library(wxribbon ${RIBBON_FILES})
--- a/build/cmake/lib/richtext/CMakeLists.txt
+++ b/build/cmake/lib/richtext/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(RICHTEXT_FILES RICHTEXT)

 wx_add_library(wxrichtext ${RICHTEXT_FILES})
--- a/build/cmake/lib/stc/CMakeLists.txt
+++ b/build/cmake/lib/stc/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(STC_FILES STC_CMN)

 if(WXOSX_COCOA)
--- a/build/cmake/lib/webview/CMakeLists.txt
+++ b/build/cmake/lib/webview/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 function(wx_webview_copy_webview2_loader target)
    if(NOT WXMSW OR NOT wxUSE_WEBVIEW_EDGE OR NOT TARGET ${target})
        return()
--- a/build/cmake/lib/xml/CMakeLists.txt
+++ b/build/cmake/lib/xml/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(XML_FILES XML)
 wx_add_library(wxxml IS_BASE ${XML_FILES})
 wx_lib_link_libraries(wxxml PRIVATE ${EXPAT_LIBRARIES})
--- a/build/cmake/lib/xrc/CMakeLists.txt
+++ b/build/cmake/lib/xrc/CMakeLists.txt
@@ -7,8 +7,6 @@
 # Licence:     wxWindows licence
 #############################################################################

-include(../../source_groups.cmake)
-
 wx_append_sources(XRC_FILES XRC)

 wx_add_library(wxxrc ${XRC_FILES})
--- a/build/cmake/main.cmake
+++ b/build/cmake/main.cmake
@@ -10,6 +10,7 @@
 list(APPEND CMAKE_MODULE_PATH "${wxSOURCE_DIR}/build/cmake/modules")

 include(build/cmake/files.cmake)            # Files list
+include(build/cmake/source_groups.cmake)    # source group definitions
 include(build/cmake/functions.cmake)        # wxWidgets functions
 include(build/cmake/toolkit.cmake)          # Platform/toolkit settings
 include(build/cmake/options.cmake)          # User options
--- a/build/cmake/source_groups.cmake
+++ b/build/cmake/source_groups.cmake
@@ -9,6 +9,8 @@

 # Define source groups for supported IDEs
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+function(wx_set_source_groups)
    source_group("Common Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/.*\\.h")
    source_group("Common Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/common/.*")
    source_group("GTK+ Sources" REGULAR_EXPRESSION "${wxSOURCE_DIR}/src/gtk/.*")
@@ -26,3 +28,4 @@ source_group("wxUniv Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/uni
    source_group("wxHTML Headers" REGULAR_EXPRESSION "${wxSOURCE_DIR}/include/wx/html/.*")
    source_group("Setup Headers" FILES ${wxSETUP_HEADER_FILE})
    source_group("Resource Files" REGULAR_EXPRESSION "${wxSOURCE_DIR}/[^.]*.(rc|ico|png|icns)$")
+endfunction()