diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-05 17:12:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-05 17:13:28 +0000 |
| commit | d7006cebbb5eea34aea8f5fd3470b7f4265d0625 (patch) | |
| tree | bfe2ea681df13fe12ba6b95b54f5fa1de7e20add /CMakeLists.txt | |
| parent | b7d1eedeb3cd7f3e0250dbe53828adfa10f4d06c (diff) | |
| download | wireshark-d7006cebbb5eea34aea8f5fd3470b7f4265d0625.tar.gz | |
Revert "Build Flex-generated files with "warnings are errors"."
This reverts commit b56f53884be3bab935058b2bbbb4da0b8bbbe7f6.
Sadly, we *do* get warnings at this point with older versions of Flex,
such as the one on the 32-bit OS X buildbot.
Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3
Reviewed-on: https://code.wireshark.org/review/12443
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c798d27cd8..1f3b007698 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1602,17 +1602,17 @@ else() endif(WIN32) # Create help/faq.txt when missing -#add_custom_command(OUTPUT "${DATAFILE_DIR}/help/faq.txt" -# COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/help" -# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/help/faq.py -b > faq.tmp.html -# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py -# faq.tmp.html > "${DATAFILE_DIR}/help/faq.txt" -# COMMAND ${CMAKE_COMMAND} -E remove faq.tmp.html -# DEPENDS -# "${CMAKE_SOURCE_DIR}/help/faq.py" -# "${CMAKE_SOURCE_DIR}/tools/html2text.py" -#) -#list(APPEND copy_data_files_depends "${DATAFILE_DIR}/help/faq.txt") +add_custom_command(OUTPUT "${DATAFILE_DIR}/help/faq.txt" + COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/help" + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/help/faq.py -b > faq.tmp.html + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py + faq.tmp.html > "${DATAFILE_DIR}/help/faq.txt" + COMMAND ${CMAKE_COMMAND} -E remove faq.tmp.html + DEPENDS + "${CMAKE_SOURCE_DIR}/help/faq.py" + "${CMAKE_SOURCE_DIR}/tools/html2text.py" +) +list(APPEND copy_data_files_depends "${DATAFILE_DIR}/help/faq.txt") # Install LUA files in staging directory such that LUA can used when Wireshark # is ran from the build directory. For install targets, see |