diff options
| author | João Valverde <j@v6e.pt> | 2021-07-03 12:58:30 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-04 10:37:49 +0000 |
| commit | 100876337af28f9e86259e0a17e28d1ea1b737a2 (patch) | |
| tree | a366f31adae1393872c124b3fa8719f2d5cd0dd5 /ui/CMakeLists.txt | |
| parent | 47d2afd99018b5ef85376e1ff81ee11af4483fa3 (diff) | |
Move version_info.[ch] to ui/
Version info is an aspect of UI implementation so move it to
a more appropriate place, such as ui/. This also helps declutter
the top-level.
A static library is appropriate to encapsulate the dependencies
as private and it is better supported by CMake than object libraries.
Also version_info.h should not be installed as a public header.
Diffstat (limited to 'ui/CMakeLists.txt')
| -rw-r--r-- | ui/CMakeLists.txt | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 06f829a77d..f3e0c6d3e6 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -78,17 +78,8 @@ set_source_files_properties( COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) - add_library(ui STATIC ${UI_SRC}) -set_target_properties(ui PROPERTIES - LINK_FLAGS "${WS_LINK_FLAGS}" - FOLDER "UI" -) -if(MSVC) - set_target_properties(ui PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}") -endif() - target_link_libraries(ui wsutil caputils) target_include_directories(ui SYSTEM @@ -96,6 +87,26 @@ target_include_directories(ui SYSTEM ${WINSPARKLE_INCLUDE_DIRS} ) +add_library(version_info STATIC version_info.c) + +if(NOT VCSVERSION_OVERRIDE) + add_dependencies(version_info version) +endif() + +target_link_libraries(version_info PRIVATE ${ZLIB_LIBRARIES}) + +target_include_directories(version_info PRIVATE ${ZLIB_INCLUDE_DIRS}) + +set_target_properties(ui version_info PROPERTIES + LINK_FLAGS "${WS_LINK_FLAGS}" + FOLDER "UI" +) +if(MSVC) + set_target_properties(ui version_info PROPERTIES + LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}" + ) +endif() + add_definitions(-DDOC_DIR="${CMAKE_INSTALL_FULL_DOCDIR}") CHECKAPI( |