diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-14 16:11:18 -0700 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-14 23:40:14 +0000 |
| commit | 51dd96fbb8895357f1ca669c7406d01fb24d1e69 (patch) | |
| tree | 97b7bb3a4e6f9b2a5f313af21d0039b1afb86775 | |
| parent | 38d08e0b6eac40188d4ba5ba4051dedd1ac135bf (diff) | |
Fix OSX buildbot
Dirty CORBA IDL dissectors must be compiled without -Werror option
Change-Id: I46431c635274399cd6d365a608cdc0aecbc59c95
Reviewed-on: https://code.wireshark.org/review/15911
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | epan/dissectors/CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt index 74528dbdc7..ef77e8ba07 100644 --- a/epan/dissectors/CMakeLists.txt +++ b/epan/dissectors/CMakeLists.txt @@ -240,14 +240,18 @@ set(DIRTY_CORBA_IDL_DISSECTOR_SRC ) set(CORBA_IDL_DISSECTOR_SRC - ${DIRTY_CORBA_IDL_DISSECTOR_SRC} packet-coseventcomm.c ) -source_group(dissectors-corba FILES ${CORBA_IDL_DISSECTOR_SRC}) +set(CORBA_IDL_DISSECTOR_FILES + ${CORBA_IDL_DISSECTOR_SRC} + ${DIRTY_CORBA_IDL_DISSECTOR_SRC} +) + +source_group(dissectors-corba FILES ${CORBA_IDL_DISSECTOR_FILES}) add_library(dissectors-corba OBJECT - ${CORBA_IDL_DISSECTOR_SRC} + ${CORBA_IDL_DISSECTOR_FILES} ) set_target_properties(dissectors-corba PROPERTIES @@ -1476,7 +1480,7 @@ source_group(dissectors FILES ${DISSECTOR_FILES}) register_dissector_files(register.c dissectors ${DISSECTOR_FILES} - ${CORBA_IDL_DISSECTOR_SRC} + ${CORBA_IDL_DISSECTOR_FILES} ) set(CLEAN_FILES @@ -1509,7 +1513,7 @@ set_target_properties(dissectors PROPERTIES set(CHECKAPI_FILE_LIST "${CMAKE_CURRENT_BINARY_DIR}/files.txt") file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h") -file(WRITE "${CHECKAPI_FILE_LIST}" "${DISSECTOR_FILES}" "${CORBA_IDL_DISSECTOR_SRC}") +file(WRITE "${CHECKAPI_FILE_LIST}" "${DISSECTOR_FILES}" "${CORBA_IDL_DISSECTOR_FILES}") CHECKAPI( NAME dissectors |