[Openvas-commits] r10483 - in trunk/openvas-libraries: . hg misc nasl omp

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-03-07 15:17:36 +0100 (Mon, 07 Mar 2011)
New Revision: 10483

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/hg/CMakeLists.txt
   trunk/openvas-libraries/misc/CMakeLists.txt
   trunk/openvas-libraries/nasl/CMakeLists.txt
   trunk/openvas-libraries/omp/CMakeLists.txt
Log:
* hg/CMakeLists.txt, misc/CMakeLists.txt, nasl/CMakeLists.txt,
  omp/CMakeLists.txt: Refer to libraries by their target name to allow
  cmake to handle dependencies correctly. Add missing link between misc
  and base when doing static linking.


Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2011-03-07 12:16:38 UTC (rev 10482)
+++ trunk/openvas-libraries/ChangeLog	2011-03-07 14:17:36 UTC (rev 10483)
@@ -1,3 +1,10 @@
+2011-03-07  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	* hg/CMakeLists.txt, misc/CMakeLists.txt, nasl/CMakeLists.txt,
+	omp/CMakeLists.txt: Refer to libraries by their target name to allow
+	cmake to handle dependencies correctly. Add missing link between misc
+	and base when doing static linking.
+
 2011-03-03  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	Post release version bump.

Modified: trunk/openvas-libraries/hg/CMakeLists.txt
===================================================================
--- trunk/openvas-libraries/hg/CMakeLists.txt	2011-03-07 12:16:38 UTC (rev 10482)
+++ trunk/openvas-libraries/hg/CMakeLists.txt	2011-03-07 14:17:36 UTC (rev 10483)
@@ -51,7 +51,7 @@
 set_target_properties (openvas_hg_shared PROPERTIES SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}")
 set_target_properties (openvas_hg_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}")
 set_target_properties (openvas_hg_shared PROPERTIES PUBLIC_HEADER "${HEADERS}")
-target_link_libraries (openvas_hg_shared resolv openvas_misc)
+target_link_libraries (openvas_hg_shared resolv openvas_misc_shared openvas_base_shared)
 
 if (OPENVAS_PID_DIR)
   add_definitions (-DOPENVAS_PID_DIR=\\\"${OPENVAS_PID_DIR}\\\")

Modified: trunk/openvas-libraries/misc/CMakeLists.txt
===================================================================
--- trunk/openvas-libraries/misc/CMakeLists.txt	2011-03-07 12:16:38 UTC (rev 10482)
+++ trunk/openvas-libraries/misc/CMakeLists.txt	2011-03-07 14:17:36 UTC (rev 10483)
@@ -110,6 +110,7 @@
 set_target_properties (openvas_misc_static PROPERTIES OUTPUT_NAME "openvas_misc")
 set_target_properties (openvas_misc_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 set_target_properties (openvas_misc_static PROPERTIES PUBLIC_HEADER "${HEADERS}")
+target_link_libraries (openvas_misc_static openvas_base_static)
 
 add_library (openvas_misc_shared SHARED ${FILES})
 
@@ -120,7 +121,7 @@
 set_target_properties (openvas_misc_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}")
 set_target_properties (openvas_misc_shared PROPERTIES PUBLIC_HEADER "${HEADERS}")
 if (NOT MINGW)
-  target_link_libraries (openvas_misc_shared glib-2.0 pcap gnutls gcrypt openvas_base)
+  target_link_libraries (openvas_misc_shared glib-2.0 pcap gnutls gcrypt openvas_base_shared)
 endif (NOT MINGW)
 
 if (OPENVASLIB_VERSION)
@@ -160,10 +161,10 @@
 endif (OPENVAS_SYSCONF_DIR)
 
 if (MINGW)
-  target_link_libraries (openvas_misc_static uuid openvas_base ${GLIB_LDFLAGS} -lglib-2.0
+  target_link_libraries (openvas_misc_static uuid openvas_base_static ${GLIB_LDFLAGS} -lglib-2.0
                          -lgcrypt -lgnutls -lintl -liconv -lgpg-error -lws2_32
                          -lole32 -lz)
-  target_link_libraries (openvas_misc_shared uuid openvas_base ${GLIB_LDFLAGS} -lglib-2.0
+  target_link_libraries (openvas_misc_shared uuid openvas_base_shared ${GLIB_LDFLAGS} -lglib-2.0
                          -lgcrypt -lgnutls -lintl -liconv -lgpg-error -lws2_32
                          -lole32 -lz)
 else (MINGW)

Modified: trunk/openvas-libraries/nasl/CMakeLists.txt
===================================================================
--- trunk/openvas-libraries/nasl/CMakeLists.txt	2011-03-07 12:16:38 UTC (rev 10482)
+++ trunk/openvas-libraries/nasl/CMakeLists.txt	2011-03-07 14:17:36 UTC (rev 10483)
@@ -98,8 +98,8 @@
 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}")
-target_link_libraries (openvas_nasl_static openvas_base openvas_misc
-			openvas_hg glib-2.0 gcrypt gpgme
+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})
 
 add_library (openvas_nasl_shared SHARED ${FILES})
@@ -110,14 +110,14 @@
 set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}")
 set_target_properties (openvas_nasl_shared PROPERTIES PUBLIC_HEADER "${HEADERS}")
 # 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 openvas_misc
-			openvas_hg glib-2.0 gcrypt gpgme
+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})
 
 # Link the openvas-nasl executable
 add_executable (openvas-nasl nasl.c)
-target_link_libraries (openvas-nasl openvas_nasl_static openvas_base
-                       openvas_misc openvas_hg ${GLIB_LDFLAGS} -lgcrypt
+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})
 set_target_properties (openvas-nasl PROPERTIES COMPILE_FLAGS
                        "${GLIB_CFLAGS} ${GPGME_CFLAGS}")

Modified: trunk/openvas-libraries/omp/CMakeLists.txt
===================================================================
--- trunk/openvas-libraries/omp/CMakeLists.txt	2011-03-07 12:16:38 UTC (rev 10482)
+++ trunk/openvas-libraries/omp/CMakeLists.txt	2011-03-07 14:17:36 UTC (rev 10483)
@@ -51,11 +51,11 @@
 set_target_properties (openvas_omp_shared PROPERTIES PUBLIC_HEADER "${HEADERS}")
 
 if (MINGW)
-  target_link_libraries (openvas_omp_shared openvas_misc -lglib-2.0 -lgnutls
+  target_link_libraries (openvas_omp_shared openvas_misc_shared -lglib-2.0 -lgnutls
                          -lgcrypt -lgpg-error -lintl -lws2_32 -liconv -lole32
                          -lz -lkernel32)
 else (MINGW)
-  target_link_libraries (openvas_omp_shared openvas_misc glib-2.0 gnutls)
+  target_link_libraries (openvas_omp_shared openvas_misc_shared glib-2.0 gnutls)
 endif (MINGW)
 
 ## Install