osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Graham Bloice 2015-01-05 23:40:52 +00:00
parent 1176db2ffe
commit a7a17047eb
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
capchild/CMakeLists.txt
View File

@ -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")

5
caputils/CMakeLists.txt
View File

@ -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")

5
codecs/CMakeLists.txt
View File

@ -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")

1
epan/CMakeLists.txt
View File

@ -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

4
ui/gtk/CMakeLists.txt
View File

@ -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")

2
wsutil/CMakeLists.txt
View File

@ -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