[Openvas-commits] r13698 - in branches/openvas-libraries-5.0: . nasl

[scm-commit at wald.intevation.org]

Author: jan
Date: 2012-07-08 23:05:24 +0200 (Sun, 08 Jul 2012)
New Revision: 13698

Modified:
   branches/openvas-libraries-5.0/ChangeLog
   branches/openvas-libraries-5.0/nasl/CMakeLists.txt
Log:
Backport of r13683 from trunk by Michael Wiegand.

* nasl/CMakeLists.txt: Ensure that compilation with modern
gccs works by moving linker flags from LINK_FLAGS to
target_link_libraries.



Modified: branches/openvas-libraries-5.0/ChangeLog
===================================================================
--- branches/openvas-libraries-5.0/ChangeLog	2012-07-08 20:49:07 UTC (rev 13697)
+++ branches/openvas-libraries-5.0/ChangeLog	2012-07-08 21:05:24 UTC (rev 13698)
@@ -1,5 +1,13 @@
 2012-07-08  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
+	Backport of r13683 from trunk by Michael Wiegand.
+
+	* nasl/CMakeLists.txt: Ensure that compilation with modern
+	gccs works by moving linker flags from LINK_FLAGS to
+	target_link_libraries.
+
+2012-07-08  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
 	Backport of r13616 from trunk by Michael Meyer.
 
 	* nasl/nasl_builtin_nmap.c: Typo fixed.

Modified: branches/openvas-libraries-5.0/nasl/CMakeLists.txt
===================================================================
--- branches/openvas-libraries-5.0/nasl/CMakeLists.txt	2012-07-08 20:49:07 UTC (rev 13697)
+++ branches/openvas-libraries-5.0/nasl/CMakeLists.txt	2012-07-08 21:05:24 UTC (rev 13698)
@@ -96,10 +96,9 @@
 set_target_properties (openvas_nasl_static PROPERTIES OUTPUT_NAME "openvas_nasl")
 set_target_properties (openvas_nasl_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 set_target_properties (openvas_nasl_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
-set_target_properties (openvas_nasl_static PROPERTIES LINK_FLAGS "${LIBSSH_LDFLAGS}")
 target_link_libraries (openvas_nasl_static openvas_base_static openvas_misc_static
 			openvas_hg_static glib-2.0 gcrypt gpgme
-			gpg-error gnutls pcap ${WMI})
+			gpg-error gnutls pcap ${WMI} "${LIBSSH_LDFLAGS}")
 
 add_library (openvas_nasl_shared SHARED ${FILES})
 set_target_properties (openvas_nasl_shared PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${WMI_LIBS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS}")
@@ -108,21 +107,19 @@
 set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
 set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}")
 set_target_properties (openvas_nasl_shared PROPERTIES PUBLIC_HEADER "${HEADERS}")
-set_target_properties (openvas_nasl_shared PROPERTIES LINK_FLAGS "${LIBSSH_LDFLAGS}")
 # line bellow is needed so it also works with no-undefined which is e.g. used by Mandriva
 target_link_libraries (openvas_nasl_shared openvas_base_shared openvas_misc_shared
 			openvas_hg_shared glib-2.0 gcrypt gpgme
-			gpg-error gnutls pcap m ${WMI})
+			gpg-error gnutls pcap m ${WMI} "${LIBSSH_LDFLAGS}")
 
 # Link the openvas-nasl executable
 add_executable (openvas-nasl nasl.c)
 target_link_libraries (openvas-nasl openvas_nasl_static openvas_base_static
                        openvas_misc_static openvas_hg_static ${GLIB_LDFLAGS} -lgcrypt
-                       -lgpgme -lgpg-error -lgnutls -lpcap -lresolv -lm ${WMI_LIBS})
+                       -lgpgme -lgpg-error -lgnutls -lpcap -lresolv -lm ${WMI_LIBS}
+                       "${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS}")
 set_target_properties (openvas-nasl PROPERTIES COMPILE_FLAGS
                        "${GLIB_CFLAGS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS}")
-set_target_properties (openvas-nasl PROPERTIES LINK_FLAGS
-                       "${GLIB_LDFLAGS} ${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS}")
 
 ## Install