diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-12-29 23:50:57 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-30 00:44:25 +0000 |
| commit | 408ea5d2fa5a786e910264bdd662fff0a0822497 (patch) | |
| tree | dc0dfbbdafb0abab1068b5af5aa084ce4fe4cfcc | |
| parent | 39559b1adc1cb2eec11a0f7a83da05909254c6ce (diff) | |
| download | wireshark-408ea5d2fa5a786e910264bdd662fff0a0822497.tar.gz | |
cmake: do not fail if help/faq.txt already exists
The glob pattern should not catch the generated faq.txt file. Fix this
by explicitly listing all source .txt files.
Bug: 11896
Change-Id: I3904a0e094b5dba3808dacaaabd4db298a8f14cb
Reviewed-on: https://code.wireshark.org/review/12930
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1090342539..22cf880d48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1600,9 +1600,15 @@ if(ENABLE_EXTCAP) ) list(APPEND copy_data_files_depends "${DATAFILE_DIR}/extcap") endif() +set(_help_files + help/capture_filters.txt + help/capturing.txt + help/display_filters.txt + help/getting_started.txt + help/overview.txt +) if(WIN32) file(TO_NATIVE_PATH "${DATAFILE_DIR}/help" _help_dest_dir) - file(GLOB _help_files RELATIVE "${CMAKE_SOURCE_DIR}" "help/*.txt") foreach(_help_file IN LISTS _help_files) add_custom_command(OUTPUT "${DATAFILE_DIR}/${_help_file}" COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/help" @@ -1615,7 +1621,7 @@ if(WIN32) list(APPEND copy_data_files_depends "${DATAFILE_DIR}/${_help_file}") endforeach() else() - list(APPEND DATA_FILES_SRC "help/*.txt") + list(APPEND DATA_FILES_SRC ${_help_files}) endif(WIN32) # Create help/faq.txt when missing |