Clean up a warning.

[metze/wireshark/wip.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4337b8a2fc6dc6f4a5f9d9f32fa126703edf683c..78b662d90fa2153a476db32e6bd5acdc28fe8cde 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1081,11 +1081,18 @@ foreach(PACKAGE ${PACKAGELIST})
                        message(STATUS "${PACKAGE} includes: ${${PACKAGE_VAR}_INCLUDE_DIRS}")
                endif()
                if (${PACKAGE_VAR}_LIBRARIES)
-                       list(APPEND WS_ALL_LIBS ${${PACKAGE_VAR}_LIBRARIES})
                        message(STATUS "${PACKAGE} libs: ${${PACKAGE_VAR}_LIBRARIES}")
                endif()
                if (${PACKAGE_VAR}_DEFINITIONS)
                        message(STATUS "${PACKAGE} definitions: ${${PACKAGE_VAR}_DEFINITIONS}")
+                       string(REPLACE ";" " " _definitions "${${PACKAGE_VAR}_DEFINITIONS}")
+                       set(CMAKE_C_FLAGS "${_definitions} ${CMAKE_C_FLAGS}")
+                       set(CMAKE_CXX_FLAGS "${_definitions} ${CMAKE_CXX_FLAGS}")
+               endif()
+               if (${PACKAGE_VAR}_LINK_FLAGS)
+                       string(REPLACE ";" " " _link_flags "${${PACKAGE_VAR}_LINK_FLAGS}")
+                       set(WS_LINK_FLAGS "${_link_flags} ${WS_LINK_FLAGS}")
+                       message(STATUS "${PACKAGE} other link flags: ${_link_flags}")
                endif()
                if (${PACKAGE_VAR}_EXECUTABLE)
                        message(STATUS "${PACKAGE} executable: ${${PACKAGE_VAR}_EXECUTABLE}")
@@ -1278,6 +1285,8 @@ set_target_properties(checkAPI
                EXCLUDE_FROM_DEFAULT_BUILD True
 )
 
+include( UseCheckAPI )
+
 add_subdirectory( capchild )
 add_subdirectory( caputils )
 add_subdirectory( codecs )
@@ -1684,11 +1693,6 @@ set(LIBEPAN_LIBS
                ${WINSPARKLE_LIBRARIES}
 )
 
-if(JSONGLIB_FOUND)
-       list(APPEND LIBEPAN_LIBS ${JSONGLIB_LIBRARIES})
-endif()
-
-
 if(WIN32)
        set(_dll_output_dir "${DATAFILE_DIR}")
        add_custom_target(copy_cli_dlls)
@@ -3031,6 +3035,7 @@ set(SHARK_PUBLIC_HEADERS
        ws_compiler_tests.h
        ws_diag_control.h
        ws_symbol_export.h
+       version_info.h
 )
 
 if(NOT WIN32)
@@ -3123,6 +3128,10 @@ if (DOXYGEN_EXECUTABLE)
                COMMAND ${CMAKE_COMMAND} -E tar "cfv" "wsar_html.zip" --format=zip wsar_html
                DEPENDS wsar_html
        )
+       set_target_properties(wsar_html wsar_html_zip PROPERTIES
+               FOLDER "Docs"
+               EXCLUDE_FROM_DEFAULT_BUILD True
+       )
 endif(DOXYGEN_EXECUTABLE)
 
 # Test suite wrapper
@@ -3199,7 +3208,6 @@ else ()
        endif()
 endif()
 
-include( UseCheckAPI )
 CHECKAPI(
        NAME
          main