Update the MSRP link, it's an actual RFC now.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a7e2f0ab960f1935d4e06c6b6286d55858a15dd..33400cd88b046d0c509b07a65012d2268c0ddca6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,7 @@ else()
        unset(WERROR)
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER MATCHES ".*clang")
        set (C_UNUSED "__attribute__((unused))" )
 else()
        set (C_UNUSED "" )
@@ -543,6 +543,14 @@ endif()
 
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
 
+set( configure_input "Built with CMake ${CMAKE_VERSION}" )
+set( VERSION ${PROJECT_VERSION} )
+
+configure_file(
+       ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist.in
+       ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist
+       @ONLY)
+
 include(FeatureSummary)
 #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
 #FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
@@ -890,6 +898,7 @@ if(BUILD_text2pcap)
        )
        set(text2pcap_CLEAN_FILES
                text2pcap.c
+               pcapio.c
        )
        set(text2pcap_FILES
                ${text2pcap_CLEAN_FILES}