H. Sivank <hsivank@gmail.com>

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.


svn path=/trunk/; revision=34201

22 files changed, 34 insertions, 34 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10cc896414..3516a50821 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index fc0c37e8d7..92fd26a9b2 100644
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -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}")
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 50c685b57e..835e1ae7e0 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -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
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index 5f2fa0f7b4..ec1254d96e 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -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
diff --git a/plugins/asn1/CMakeLists.txt b/plugins/asn1/CMakeLists.txt
index 960c68fe1d..f388faa609 100644
--- a/plugins/asn1/CMakeLists.txt
+++ b/plugins/asn1/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index e30973844c..6e70a08b86 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index 15d66ce93b..dfb4911164 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/giop/CMakeLists.txt b/plugins/giop/CMakeLists.txt
index 793ae621ed..1ee4908bd5 100644
--- a/plugins/giop/CMakeLists.txt
+++ b/plugins/giop/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index 395eb92d7c..29e4305442 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/interlink/CMakeLists.txt b/plugins/interlink/CMakeLists.txt
index c3b10e0af2..982451ae8e 100644
--- a/plugins/interlink/CMakeLists.txt
+++ b/plugins/interlink/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index f99f7cd5c6..3c7fd3dfcc 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index a067cfde43..967e514ab5 100644
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index e780c7da01..33f4150f9a 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index 9e529bd421..94edffa4cc 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index affdfdd0c3..bb306a235e 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/sercosiii/CMakeLists.txt b/plugins/sercosiii/CMakeLists.txt
index e0a951bd75..1280867582 100644
--- a/plugins/sercosiii/CMakeLists.txt
+++ b/plugins/sercosiii/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index 763d87d8e4..9ed2b63e38 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index 67db8503e3..a1cc41f028 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index c3bb5c151a..2bc2bdfaec 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -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)
 
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index 0b3700c58d..05c2fca31c 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -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)
 
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 367c0e2798..67e1ec7d99 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -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})
 
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 887396807f..7e6d80f8fa 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -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})