osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Peter Wu 2015-12-29 23:50:57 +01:00 committed by Michael Mann
parent 39559b1adc
commit 408ea5d2fa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -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