diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-07-01 08:21:39 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-07-01 06:22:29 +0000 |
| commit | eb239946c6faab7a7578021d0ce7b5efe73bc46b (patch) | |
| tree | 81ce17a3231483dc50403b06a7304bf80ddbbabb /CMakeLists.txt | |
| parent | a452d16f2c27fc44a41f14d05acca8e94b1c71d8 (diff) | |
Generate version.h before adding subdirs (especially wsutil). Otherwise
build could fail in wsutil because of missing version.h
Change-Id: If6fdf1080c6de9ca1581bcc126506e78ec03a1d8
Reviewed-on: https://code.wireshark.org/review/2740
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 662d961375..7f94c750a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -701,6 +701,25 @@ set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}") set_property(GLOBAL PROPERTY USE_FOLDERS ON) +ADD_CUSTOM_TARGET( + gitversion ALL + COMMAND ${PERL_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl + ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl +) +set_target_properties(gitversion PROPERTIES FOLDER "Auxiliary") + +ADD_CUSTOM_COMMAND( + OUTPUT version.h + COMMAND ${PERL_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl + ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl +) + if(ENABLE_PLUGINS) set(HAVE_PLUGINS 1) set(PLUGIN_DIR "${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}") @@ -872,25 +891,6 @@ link_directories( ${CMAKE_BINARY_DIR}/wsutil ) -ADD_CUSTOM_TARGET( - gitversion ALL - COMMAND ${PERL_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl - ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl -) -set_target_properties(gitversion PROPERTIES FOLDER "Auxiliary") - -ADD_CUSTOM_COMMAND( - OUTPUT version.h - COMMAND ${PERL_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl - ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl -) - if(UNIX) set(PLATFORM_PCAP_SRC capture-pcap-util-unix.c |