Index: gtk/CMakeLists.txt
===================================================================
--- gtk/CMakeLists.txt	(revision 34158)
+++ gtk/CMakeLists.txt	(working copy)
@@ -225,7 +225,7 @@
 	${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: wsutil/CMakeLists.txt
===================================================================
--- wsutil/CMakeLists.txt	(revision 34158)
+++ wsutil/CMakeLists.txt	(working copy)
@@ -50,7 +50,7 @@
 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})
 
Index: plugins/irda/CMakeLists.txt
===================================================================
--- plugins/irda/CMakeLists.txt	(revision 34158)
+++ plugins/irda/CMakeLists.txt	(working copy)
@@ -56,7 +56,7 @@
 )
 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: plugins/docsis/CMakeLists.txt
===================================================================
--- plugins/docsis/CMakeLists.txt	(revision 34158)
+++ plugins/docsis/CMakeLists.txt	(working copy)
@@ -88,7 +88,7 @@
 )
 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: plugins/wimax/CMakeLists.txt
===================================================================
--- plugins/wimax/CMakeLists.txt	(revision 34158)
+++ plugins/wimax/CMakeLists.txt	(working copy)
@@ -99,7 +99,7 @@
 )
 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: plugins/gryphon/CMakeLists.txt
===================================================================
--- plugins/gryphon/CMakeLists.txt	(revision 34158)
+++ plugins/gryphon/CMakeLists.txt	(working copy)
@@ -54,7 +54,7 @@
 )
 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: plugins/mate/CMakeLists.txt
===================================================================
--- plugins/mate/CMakeLists.txt	(revision 34158)
+++ plugins/mate/CMakeLists.txt	(working copy)
@@ -75,7 +75,7 @@
 )
 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: plugins/profinet/CMakeLists.txt
===================================================================
--- plugins/profinet/CMakeLists.txt	(revision 34158)
+++ plugins/profinet/CMakeLists.txt	(working copy)
@@ -66,7 +66,7 @@
 )
 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: plugins/unistim/CMakeLists.txt
===================================================================
--- plugins/unistim/CMakeLists.txt	(revision 34158)
+++ plugins/unistim/CMakeLists.txt	(working copy)
@@ -54,7 +54,7 @@
 )
 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: plugins/sercosiii/CMakeLists.txt
===================================================================
--- plugins/sercosiii/CMakeLists.txt	(revision 34158)
+++ plugins/sercosiii/CMakeLists.txt	(working copy)
@@ -65,7 +65,7 @@
 )
 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: plugins/m2m/CMakeLists.txt
===================================================================
--- plugins/m2m/CMakeLists.txt	(revision 34158)
+++ plugins/m2m/CMakeLists.txt	(working copy)
@@ -59,7 +59,7 @@
 )
 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: plugins/giop/CMakeLists.txt
===================================================================
--- plugins/giop/CMakeLists.txt	(revision 34158)
+++ plugins/giop/CMakeLists.txt	(working copy)
@@ -58,7 +58,7 @@
 )
 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 @@
 )
 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 @@
 )
 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 @@
 )
 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: plugins/interlink/CMakeLists.txt
===================================================================
--- plugins/interlink/CMakeLists.txt	(revision 34158)
+++ plugins/interlink/CMakeLists.txt	(working copy)
@@ -54,7 +54,7 @@
 )
 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: plugins/ethercat/CMakeLists.txt
===================================================================
--- plugins/ethercat/CMakeLists.txt	(revision 34158)
+++ plugins/ethercat/CMakeLists.txt	(working copy)
@@ -60,7 +60,7 @@
 )
 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: plugins/asn1/CMakeLists.txt
===================================================================
--- plugins/asn1/CMakeLists.txt	(revision 34158)
+++ plugins/asn1/CMakeLists.txt	(working copy)
@@ -59,7 +59,7 @@
 )
 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: plugins/opcua/CMakeLists.txt
===================================================================
--- plugins/opcua/CMakeLists.txt	(revision 34158)
+++ plugins/opcua/CMakeLists.txt	(working copy)
@@ -67,7 +67,7 @@
 )
 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: plugins/wimaxasncp/CMakeLists.txt
===================================================================
--- plugins/wimaxasncp/CMakeLists.txt	(revision 34158)
+++ plugins/wimaxasncp/CMakeLists.txt	(working copy)
@@ -58,7 +58,7 @@
 )
 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: plugins/stats_tree/CMakeLists.txt
===================================================================
--- plugins/stats_tree/CMakeLists.txt	(revision 34158)
+++ plugins/stats_tree/CMakeLists.txt	(working copy)
@@ -43,7 +43,7 @@
 )
 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: epan/CMakeLists.txt
===================================================================
--- epan/CMakeLists.txt	(revision 34158)
+++ epan/CMakeLists.txt	(working copy)
@@ -1303,7 +1303,7 @@
 	${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: wiretap/CMakeLists.txt
===================================================================
--- wiretap/CMakeLists.txt	(revision 34158)
+++ wiretap/CMakeLists.txt	(working copy)
@@ -101,7 +101,7 @@
 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: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 34158)
+++ CMakeLists.txt	(working copy)
@@ -631,7 +631,7 @@
 	)
 	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()
@@ -653,7 +653,7 @@
 	)
 	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()
@@ -669,7 +669,7 @@
 	)
 	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()
@@ -683,7 +683,7 @@
 		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()
@@ -703,7 +703,7 @@
 		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()
@@ -725,7 +725,7 @@
 	)
 	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()
@@ -742,7 +742,7 @@
 	)
 	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()
@@ -760,7 +760,7 @@
 	)
 	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()
@@ -778,7 +778,7 @@
 	)
 	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()
@@ -811,7 +811,7 @@
 	)
 	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: codecs/CMakeLists.txt
===================================================================
--- codecs/CMakeLists.txt	(revision 34158)
+++ codecs/CMakeLists.txt	(working copy)
@@ -29,4 +29,4 @@
 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}")