diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-05-05 09:56:55 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-05-05 18:40:46 +0000 |
| commit | cc020694076af8d3e5cd9cba6db2c8e0bd435714 (patch) | |
| tree | a2ff7f4a95228480defaf7f68762de02a0045bff /CMakeLists.txt | |
| parent | 3a7c78886854b646c6236b717b9c398a18d125cf (diff) | |
| download | wireshark-cc020694076af8d3e5cd9cba6db2c8e0bd435714.tar.gz | |
CMake: Try to fix version.h dependencies.
Make the gitversion target depend on version.h instead of running
make-version.pl separately. Make wsutil and qtui depend on gitversion.
Change-Id: I32f25347c12c7f86b2439ed4bf517cc8f5fb106f
Reviewed-on: https://code.wireshark.org/review/8299
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 19458c7e1a..4cd2286c81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -904,24 +904,20 @@ test_big_endian(WORDS_BIGENDIAN) set_property(GLOBAL PROPERTY USE_FOLDERS ON) -ADD_CUSTOM_TARGET( - gitversion ALL +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 ) -set_target_properties(gitversion PROPERTIES FOLDER "Auxiliary") -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 ) @@ -934,6 +930,8 @@ 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() @@ -1698,6 +1696,7 @@ if(BUILD_wireshark AND QT_FOUND) ${NL_LIBRARIES} ) # wireshark and wireshark-gtk share wireshark_FILES + add_dependencies(qtui gitversion) # Policy since 2.8.11 if (POLICY CMP0020) @@ -2244,6 +2243,7 @@ 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}) |