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:
parent
1176db2ffe
commit
a7a17047eb
|
@ -43,5 +43,6 @@ add_library(capchild STATIC
|
||||||
${CAPCHILD_SRC}
|
${CAPCHILD_SRC}
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(capchild PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
|
set_target_properties(capchild PROPERTIES
|
||||||
set_target_properties(capchild PROPERTIES FOLDER "CAPCHILD")
|
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||||
|
FOLDER "Libs")
|
||||||
|
|
|
@ -65,5 +65,6 @@ add_library(caputils STATIC
|
||||||
${CAPUTILS_SRC}
|
${CAPUTILS_SRC}
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(caputils PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
|
set_target_properties(caputils PROPERTIES
|
||||||
set_target_properties(caputils PROPERTIES FOLDER "CAPUTILS")
|
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||||
|
FOLDER "Libs")
|
||||||
|
|
|
@ -36,5 +36,6 @@ endif()
|
||||||
add_library(codecs STATIC
|
add_library(codecs STATIC
|
||||||
${CODECS_FILES}
|
${CODECS_FILES}
|
||||||
)
|
)
|
||||||
set_target_properties(codecs PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
|
set_target_properties(codecs PROPERTIES
|
||||||
set_target_properties(codecs PROPERTIES FOLDER "codecs")
|
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||||
|
FOLDER "Libs")
|
||||||
|
|
|
@ -1528,6 +1528,7 @@ ADD_CUSTOM_TARGET(
|
||||||
enterprise-numbers
|
enterprise-numbers
|
||||||
${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
|
${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
|
||||||
)
|
)
|
||||||
|
set_target_properties(update-sminmpec PROPERTIES FOLDER "tools")
|
||||||
|
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
OUTPUT ps.c
|
OUTPUT ps.c
|
||||||
|
|
|
@ -252,4 +252,6 @@ add_library(gtkui STATIC
|
||||||
${PLATFORM_UI_SRC}
|
${PLATFORM_UI_SRC}
|
||||||
wireshark-tap-register.c
|
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")
|
||||||
|
|
|
@ -161,7 +161,7 @@ set_target_properties(wsutil PROPERTIES
|
||||||
COMPILE_DEFINITIONS "WS_BUILD_DLL"
|
COMPILE_DEFINITIONS "WS_BUILD_DLL"
|
||||||
LINK_FLAGS "${WS_LINK_FLAGS}"
|
LINK_FLAGS "${WS_LINK_FLAGS}"
|
||||||
VERSION ${FULL_SO_VERSION} SOVERSION 0
|
VERSION ${FULL_SO_VERSION} SOVERSION 0
|
||||||
FOLDER "DLLs")
|
FOLDER "Libs")
|
||||||
|
|
||||||
if(ENABLE_APPLICATION_BUNDLE)
|
if(ENABLE_APPLICATION_BUNDLE)
|
||||||
set_target_properties(wsutil PROPERTIES
|
set_target_properties(wsutil PROPERTIES
|
||||||
|
|
Loading…
Reference in New Issue