diff options
| author | João Valverde <j@v6e.pt> | 2017-11-20 14:47:51 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-11-20 14:48:05 +0000 |
| commit | 4fbb2df3cd160aba589dc0a576b44c2a63b4a6fe (patch) | |
| tree | 99d1d066b81a1eda9445daa59ccb60f9c688324b /epan/dissectors/CMakeLists.txt | |
| parent | c26ad500ecf2cd04e9f0ba41402047fa1cbae678 (diff) | |
Revert "make-dissectors: Be more resilient with whitespace"
This reverts commit ed9d08552049d061a8951f2dee5bc7b73173c14d.
It's causing a segfault on our Windows buildbots.
Change-Id: I3cdd31955bdec7be3ad91cff4af8dc3efdc9e8b7
Reviewed-on: https://code.wireshark.org/review/24510
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/CMakeLists.txt')
| -rw-r--r-- | epan/dissectors/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt index 9ed4b7d27b..1f2771c3f2 100644 --- a/epan/dissectors/CMakeLists.txt +++ b/epan/dissectors/CMakeLists.txt @@ -1848,6 +1848,7 @@ source_group(dissector-support FILES ${DISSECTOR_SUPPORT_SRC}) set(DISSECTOR_FILES ${DISSECTOR_SRC} ${PIDL_DISSECTOR_SRC} + ${PIDL_DISSECTOR_AUTOGEN_SRC} ${ASN1_DISSECTOR_SRC} ${NCP2222_DISSECTOR_SRC} ${CUSTOM_DISSECTOR_SRC} @@ -1865,7 +1866,7 @@ target_link_libraries(make-dissectors ${GLIB2_LIBRARIES}) file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dissectors.c.in" - CONTENT "$<JOIN:${ALL_DISSECTOR_SRC},\n>\n" + CONTENT "$<JOIN:${ALL_DISSECTOR_SRC}, >" ) add_custom_command( OUTPUT dissectors.c |