diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-05 23:40:52 +0000 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-05 23:48:46 +0000 |
| commit | a7a17047eb5a4a10c02aa6e0664ba30904621f52 (patch) | |
| tree | f29651cfa843a8c0009e70e8eece9258c50ab0dc | |
| parent | 1176db2ffe23a8467967787ea02912b8ad9807d3 (diff) | |
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>
| -rw-r--r-- | capchild/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | caputils/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | codecs/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ui/gtk/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/capchild/CMakeLists.txt b/capchild/CMakeLists.txt index 8535144550..cc94e47d3f 100644 --- 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 a3a308ba0f..3bf314f98a 100644 --- 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 eea8f145e3..6397db18c0 100644 --- 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 3c65702395..53557e98a0 100644 --- 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 a7643a606e..d3acfb8e69 100644 --- 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 03d846d202..b3bdbb383f 100644 --- 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 |