Minor CMake updates to better group build artefacts

Move capchild, caputils, codecs and wsutil into a Libs group
Move gtkui into UI group
Move update-sminmpec into tools group

Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee
Reviewed-on: https://code.wireshark.org/review/6332
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>

diff --git a/capchild/CMakeLists.txt b/capchild/CMakeLists.txt
index 8535144550a6bf62feee74c69d96dd291cd7572a..cc94e47d3f341293ba92ccf00441f038a858ef17 100644 (file)
--- a/capchild/CMakeLists.txt
+++ b/capchild/CMakeLists.txt
@@ -43,5 +43,6 @@ add_library(capchild STATIC
        ${CAPCHILD_SRC}
 )
 
-set_target_properties(capchild PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(capchild PROPERTIES FOLDER "CAPCHILD")
+set_target_properties(capchild PROPERTIES
+       LINK_FLAGS "${WS_LINK_FLAGS}"
+       FOLDER "Libs")

diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt
index a3a308ba0f600da1a64f5359704aba6e4caae3fc..3bf314f98aacbc444653a69b8b59fe7d6e582912 100644 (file)
--- a/caputils/CMakeLists.txt
+++ b/caputils/CMakeLists.txt
@@ -65,5 +65,6 @@ add_library(caputils STATIC
        ${CAPUTILS_SRC}
 )
 
-set_target_properties(caputils PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(caputils PROPERTIES FOLDER "CAPUTILS")
+set_target_properties(caputils PROPERTIES
+       LINK_FLAGS "${WS_LINK_FLAGS}"
+       FOLDER "Libs")

diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index eea8f145e3d1ca975c1cc2f6677beaee7b58320e..6397db18c09b6387c5fab68358937656734fced4 100644 (file)
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -36,5 +36,6 @@ endif()
 add_library(codecs STATIC
   ${CODECS_FILES}
 )
-set_target_properties(codecs PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(codecs PROPERTIES FOLDER "codecs")
+set_target_properties(codecs PROPERTIES
+       LINK_FLAGS "${WS_LINK_FLAGS}"
+       FOLDER "Libs")

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 3c65702395094098aa37dfd82f40ca6704ffafda..53557e98a014e87a1dfd26d15cc0e6a2e56c4f75 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1528,6 +1528,7 @@ ADD_CUSTOM_TARGET(
                enterprise-numbers
                ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
 )
+set_target_properties(update-sminmpec PROPERTIES FOLDER "tools")
 
 ADD_CUSTOM_COMMAND(
        OUTPUT  ps.c

diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index a7643a606ee626ed778d59d7c899cb88f9dfd50c..d3acfb8e69b8d3fbb731e4918c78ebba3a2b0f0c 100644 (file)
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -252,4 +252,6 @@ add_library(gtkui STATIC
        ${PLATFORM_UI_SRC}
        wireshark-tap-register.c
 )
-set_target_properties(gtkui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+set_target_properties(gtkui PROPERTIES
+       LINK_FLAGS "${WS_LINK_FLAGS}"
+       FOLDER "UI")

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 03d846d202893fe22f35b10c1f611423f9556358..b3bdbb383fef2744fa8de5677664b74a203a6e8b 100644 (file)
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -161,7 +161,7 @@ set_target_properties(wsutil PROPERTIES
        COMPILE_DEFINITIONS "WS_BUILD_DLL"
        LINK_FLAGS "${WS_LINK_FLAGS}"
        VERSION ${FULL_SO_VERSION} SOVERSION 0
-       FOLDER "DLLs")
+       FOLDER "Libs")
 
 if(ENABLE_APPLICATION_BUNDLE)
        set_target_properties(wsutil PROPERTIES