diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2015-08-26 08:50:09 +0400 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2015-08-26 07:37:02 +0000 |
| commit | 57b2b7702258a6b69edb734f6261762309d652bd (patch) | |
| tree | 7ddb470c66ea7d988f87dfab8c362fef7595a521 /CMakeLists.txt | |
| parent | c18d2f819345cea18b6db50a8062a1126a55b6bf (diff) | |
| download | wireshark-57b2b7702258a6b69edb734f6261762309d652bd.tar.gz | |
cmake: rework version.h handling to treat it like config.h
It wasn't working on my system: I kept seeing the old git revision
in '...shark -v' even after deleting version.h
Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5
Reviewed-on: https://code.wireshark.org/review/10265
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e5ea9d617..e4f506d179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -922,21 +922,6 @@ test_big_endian(WORDS_BIGENDIAN) set_property(GLOBAL PROPERTY USE_FOLDERS ON) -add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/version.h - COMMAND ${PERL_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl - ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl -) - -add_custom_target( - gitversion ALL - DEPENDS ${CMAKE_BINARY_DIR}/version.h -) -set_target_properties(gitversion PROPERTIES FOLDER "Auxiliary") - add_subdirectory( asn1 EXCLUDE_FROM_ALL ) add_subdirectory( capchild ) add_subdirectory( caputils ) @@ -948,8 +933,6 @@ add_subdirectory( ui ) add_subdirectory( wiretap ) add_subdirectory( wsutil ) -add_dependencies(wsutil gitversion) - if(NOT WIN32) add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil color.h) endif() @@ -1064,8 +1047,18 @@ else() endif() set( VERSION ${PROJECT_VERSION} ) +execute_process( + COMMAND ${PERL_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl + --print-vcs + ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE VERSION_H_CONTENT +) set( configure_input "Built with CMake ${CMAKE_VERSION}" ) configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h) +configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_BINARY_DIR}/version.h) +#set_target_properties(${CMAKE_BINARY_DIR}/version.h PROPERTIES FOLDER "Auxiliary") + set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/") set( IN_FILES adns_dll.rc @@ -1693,8 +1686,6 @@ if(BUILD_wireshark AND QT_FOUND) ${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ${NL_LIBRARIES} ) - # wireshark and wireshark-gtk share wireshark_FILES - add_dependencies(qtui gitversion) # Policy since 2.8.11 if (POLICY CMP0020) @@ -2242,7 +2233,6 @@ if(BUILD_androiddump) add_executable(androiddump WIN32 ${androiddump_FILES}) # XXX Shouldn't we add wsutil to androiddump_LIBS instead? - add_dependencies(androiddump gitversion) set_extcap_executable_properties(androiddump) target_link_libraries(androiddump ${androiddump_LIBS}) install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR}) |