H. Sivank <hsivank@gmail.com>
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 23 Sep 2010 07:02:33 +0000 (07:02 +0000)
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 23 Sep 2010 07:02:33 +0000 (07:02 +0000)
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34201 f5534014-38df-0310-8fa8-9805f1628bb7

22 files changed:
CMakeLists.txt
codecs/CMakeLists.txt
epan/CMakeLists.txt
gtk/CMakeLists.txt
plugins/asn1/CMakeLists.txt
plugins/docsis/CMakeLists.txt
plugins/ethercat/CMakeLists.txt
plugins/giop/CMakeLists.txt
plugins/gryphon/CMakeLists.txt
plugins/interlink/CMakeLists.txt
plugins/irda/CMakeLists.txt
plugins/m2m/CMakeLists.txt
plugins/mate/CMakeLists.txt
plugins/opcua/CMakeLists.txt
plugins/profinet/CMakeLists.txt
plugins/sercosiii/CMakeLists.txt
plugins/stats_tree/CMakeLists.txt
plugins/unistim/CMakeLists.txt
plugins/wimax/CMakeLists.txt
plugins/wimaxasncp/CMakeLists.txt
wiretap/CMakeLists.txt
wsutil/CMakeLists.txt

index 10cc896414943700a7e8b2936adaaf738d42399e..3516a508216d785a31babb5e3a2db001451c7c4e 100644 (file)
@@ -640,7 +640,7 @@ if(BUILD_wireshark)
        )
        add_executable(wireshark ${wireshark_FILES})
        add_dependencies(wireshark svnversion)
-       set_target_properties(wireshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(wireshark ${wireshark_LIBS})
        install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -662,7 +662,7 @@ if(BUILD_tshark)
        )
        add_executable(tshark ${tshark_FILES})
        add_dependencies(tshark svnversion)
-       set_target_properties(tshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(tshark ${tshark_LIBS})
        install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -678,7 +678,7 @@ if(BUILD_rawshark)
        )
        add_executable(rawshark ${rawshark_FILES})
        add_dependencies(rawshark svnversion)
-       set_target_properties(rawshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(rawshark ${rawshark_LIBS})
        install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -692,7 +692,7 @@ if(BUILD_dftest)
                util.c
        )
        add_executable(dftest ${dftest_FILES})
-       set_target_properties(dftest PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(dftest ${dftest_LIBS})
        install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -712,7 +712,7 @@ if(BUILD_randpkt)
                randpkt.c
        )
        add_executable(randpkt ${randpkt_FILES})
-       set_target_properties(randpkt PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(randpkt PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(randpkt ${randpkt_LIBS})
        install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -734,7 +734,7 @@ if(BUILD_text2pcap)
        )
        add_executable(text2pcap ${text2pcap_FILES})
        add_dependencies(text2pcap svnversion)
-       set_target_properties(text2pcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(text2pcap ${text2pcap_LIBS})
        install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -751,7 +751,7 @@ if(BUILD_mergecap)
        )
        add_executable(mergecap ${mergecap_FILES})
        add_dependencies(mergecap svnversion)
-       set_target_properties(mergecap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(mergecap ${mergecap_LIBS})
        install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -769,7 +769,7 @@ if(BUILD_capinfos)
        )
        add_executable(capinfos ${capinfos_FILES})
        add_dependencies(capinfos svnversion)
-       set_target_properties(capinfos PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(capinfos ${capinfos_LIBS})
        install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -787,7 +787,7 @@ if(BUILD_editcap)
        )
        add_executable(editcap ${editcap_FILES})
        add_dependencies(editcap svnversion)
-       set_target_properties(editcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(editcap ${editcap_LIBS})
        install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
@@ -820,7 +820,7 @@ if(BUILD_dumpcap)
        )
        add_executable(dumpcap ${dumpcap_FILES})
        add_dependencies(dumpcap svnversion)
-       set_target_properties(dumpcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+       set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
        target_link_libraries(dumpcap ${dumpcap_LIBS})
        install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
index fc0c37e8d7f5af53f143b20a9db1802a85631dcc..92fd26a9b2bc1951f1a08541fb99028120c19ab8 100644 (file)
@@ -29,4 +29,4 @@ set(CODECS_FILES
 add_library(codecs STATIC
   ${CODECS_FILES}
 )
-set_target_properties(codecs PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(codecs PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
index 50c685b57e886a919fd87e0802ae0aa2652d060b..835e1ae7e0e83c98bc836d875775d10471bb4f14 100644 (file)
@@ -1304,7 +1304,7 @@ add_library(epan ${LINK_MODE_LIB}
        ${DISSECTOR_SUPPORT_SRC}
        ${LIBWIRESHARK_ASM_FILES}
 )
-set_target_properties(epan PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 # By default the name for a library with target name epan will be libepan,
 # but Ethereal is now named Wireshark
index 5f2fa0f7b45d35a8e528625f2903d1072f4c6c92..ec1254d96ebf8820916d5137be2dab357994c1c6 100644 (file)
@@ -225,7 +225,7 @@ add_library(ui STATIC
        ${WIRESHARK_TAP_SRC}
        wireshark-tap-register.c
 )
-set_target_properties(ui PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(ui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 #install(TARGETS ui
 #      LIBRARY DESTINATION lib
index 960c68fe1dd6e3db4381fc1f1a2af0ce1401b9fe..f388faa6091864bb2fe8ab000c20a14e2c975369 100644 (file)
@@ -59,7 +59,7 @@ add_library(asn1 ${LINK_MODE_MODULE}
 )
 set_target_properties(asn1 PROPERTIES PREFIX "")
 set_target_properties(asn1 PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(asn1 PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(asn1 PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(asn1 epan)
 
index e30973844c98aa4398429e8f7bac18ca72db9e66..6e70a08b86ae163db40dcbc525bbe0c29e067609 100644 (file)
@@ -88,7 +88,7 @@ add_library(docsis ${LINK_MODE_MODULE}
 )
 set_target_properties(docsis PROPERTIES PREFIX "")
 set_target_properties(docsis PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(docsis PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(docsis PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(docsis epan)
 
index 15d66ce93b69364fc1c231a9ac36c48e8efe81cc..dfb49111643516afc4d372c94c29ee67b7f3de07 100644 (file)
@@ -60,7 +60,7 @@ add_library(ethercat ${LINK_MODE_MODULE}
 )
 set_target_properties(ethercat PROPERTIES PREFIX "")
 set_target_properties(ethercat PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(ethercat PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(ethercat PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(ethercat epan)
 
index 793ae621ed0c427fb2c1964e8f5cc8c2c3827899..1ee4908bd5d22d103769e0b1bcb37ea2df790d67 100644 (file)
@@ -58,7 +58,7 @@ add_library(cosnaming ${LINK_MODE_MODULE}
 )
 set_target_properties(cosnaming PROPERTIES PREFIX "")
 set_target_properties(cosnaming PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(cosnaming PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(cosnaming PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(cosnaming epan)
 
@@ -73,7 +73,7 @@ add_library(coseventcomm ${LINK_MODE_MODULE}
 )
 set_target_properties(coseventcomm PROPERTIES PREFIX "")
 set_target_properties(coseventcomm PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(coseventcomm PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(coseventcomm PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(coseventcomm epan)
 
@@ -88,7 +88,7 @@ add_library(tango ${LINK_MODE_MODULE}
 )
 set_target_properties(tango PROPERTIES PREFIX "")
 set_target_properties(tango PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(tango PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(tango PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(tango epan)
 
@@ -103,7 +103,7 @@ add_library(parlay ${LINK_MODE_MODULE}
 )
 set_target_properties(parlay PROPERTIES PREFIX "")
 set_target_properties(parlay PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(parlay PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(parlay PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(parlay epan)
 
index 395eb92d7c9186f699789c0f69bfb146abf27123..29e430544214abef5a82e732a92df6ed0724bda3 100644 (file)
@@ -54,7 +54,7 @@ add_library(gryphon ${LINK_MODE_MODULE}
 )
 set_target_properties(gryphon PROPERTIES PREFIX "")
 set_target_properties(gryphon PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(gryphon PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(gryphon PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(gryphon epan)
 
index c3b10e0af2723c32228a78d4d8c7e050a00de8f8..982451ae8ee8e6f496482f42235f95cc8be83d5f 100644 (file)
@@ -54,7 +54,7 @@ add_library(interlink ${LINK_MODE_MODULE}
 )
 set_target_properties(interlink PROPERTIES PREFIX "")
 set_target_properties(interlink PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(interlink PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(interlink PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(interlink epan)
 
index f99f7cd5c69091ccf6e29ce94f888107dfd3d41e..3c7fd3dfcc42681d84c1ae087ed3b6c95400feb5 100644 (file)
@@ -56,7 +56,7 @@ add_library(irda ${LINK_MODE_MODULE}
 )
 set_target_properties(irda PROPERTIES PREFIX "")
 set_target_properties(irda PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(irda PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(irda PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(irda epan)
 
index a067cfde432491fee36e9899bed652507a4bb331..967e514ab5b24041181d39fa9d81b834480ea99b 100644 (file)
@@ -59,7 +59,7 @@ add_library(m2m ${LINK_MODE_MODULE}
 )
 set_target_properties(m2m PROPERTIES PREFIX "")
 set_target_properties(m2m PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(m2m PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(m2m PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(m2m epan)
 
index e780c7da018d6a6ffe15e57bf3ebc2a255e1ee80..33f4150f9a3bff393afceb76d0f38ec9bc42c182 100644 (file)
@@ -75,7 +75,7 @@ add_library(mate ${LINK_MODE_MODULE}
 )
 set_target_properties(mate PROPERTIES PREFIX "")
 set_target_properties(mate PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(mate PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(mate PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(mate epan)
 
index 9e529bd421c05e33a60ca95a1a65dd1898c15cc8..94edffa4cc3afc26c136c232387eac989696b539 100644 (file)
@@ -67,7 +67,7 @@ add_library(opcua ${LINK_MODE_MODULE}
 )
 set_target_properties(opcua PROPERTIES PREFIX "")
 set_target_properties(opcua PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(opcua PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(opcua PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(opcua epan)
 
index affdfdd0c313c2823f78f901742703b56fa14af2..bb306a235e0e2c5e47a55c627d7041ba0a3507bc 100644 (file)
@@ -66,7 +66,7 @@ add_library(profinet ${LINK_MODE_MODULE}
 )
 set_target_properties(profinet PROPERTIES PREFIX "")
 set_target_properties(profinet PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(profinet PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(profinet PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(profinet epan)
 
index e0a951bd75c099b73979b7809cb5288b9c428a84..12808675822699a0ee76ff420b19be5134e2782e 100644 (file)
@@ -65,7 +65,7 @@ add_library(sercosiii ${LINK_MODE_MODULE}
 )
 set_target_properties(sercosiii PROPERTIES PREFIX "")
 set_target_properties(sercosiii PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(sercosiii PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(sercosiii PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(sercosiii epan)
 
index 763d87d8e48d32b01ecbfa80ebea1428d63bd03e..9ed2b63e38667d072e5fad3a9e6eb02f31ee1bce 100644 (file)
@@ -43,7 +43,7 @@ add_library(stats_tree ${LINK_MODE_MODULE}
 )
 set_target_properties(stats_tree PROPERTIES PREFIX "")
 set_target_properties(stats_tree PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(stats_tree PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(stats_tree PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(stats_tree epan)
 
index 67db8503e36bb69daeb317b4a74b1cbb4edc3ede..a1cc41f02839e990a5d282b1ded5d2e789b185f7 100644 (file)
@@ -54,7 +54,7 @@ add_library(unistim ${LINK_MODE_MODULE}
 )
 set_target_properties(unistim PROPERTIES PREFIX "")
 set_target_properties(unistim PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(unistim PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(unistim PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(unistim epan)
 
index c3bb5c151a9dfa8c707a56326f2e0e8c0d2c0671..2bc2bdfaeca588404a1f2a910422461d0d107486 100644 (file)
@@ -99,7 +99,7 @@ add_library(wimax ${LINK_MODE_MODULE}
 )
 set_target_properties(wimax PROPERTIES PREFIX "")
 set_target_properties(wimax PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(wimax PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(wimax PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(wimax epan)
 
index 0b3700c58dfa422514c46b2605b1b8d661ccbcbe..05c2fca31cc41f824b673ed911bcc5791604f413 100644 (file)
@@ -58,7 +58,7 @@ add_library(wimaxasncp ${LINK_MODE_MODULE}
 )
 set_target_properties(wimaxasncp PROPERTIES PREFIX "")
 set_target_properties(wimaxasncp PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION})
-set_target_properties(wimaxasncp PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(wimaxasncp PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(wimaxasncp epan)
 
index 367c0e27987df72357d5c140cd5c34a6cf72f878..67e1ec7d9976b246c452c47835184026cab03e8d 100644 (file)
@@ -101,7 +101,7 @@ set(wiretap_LIBS
 add_library(wiretap ${LINK_MODE_LIB}
        ${WIRETAP_FILES}
 )
-set_target_properties(wiretap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(wiretap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(wiretap ${wiretap_LIBS})
 
index 887396807f722e81a9bd6c2c573f6de0e4d85721..7e6d80f8fae19decf60bbeb0f7e33af030438527 100644 (file)
@@ -50,7 +50,7 @@ set(wsutil_LIBS
 add_library(wsutil ${LINK_MODE_LIB}
   ${WSUTIL_FILES}
 )
-set_target_properties(wsutil PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+set_target_properties(wsutil PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 
 target_link_libraries(wsutil ${wsutil_LIBS})