[Openvas-commits] r3444 - in trunk/openvas-manager: . src/tests

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-05-20 15:03:27 +0200 (Wed, 20 May 2009)
New Revision: 3444

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/tests/CMakeLists.txt
Log:
	* src/tests/CMakeLists.txt (OVAS_LDFLAG): Add libopenvas.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-05-20 13:03:10 UTC (rev 3443)
+++ trunk/openvas-manager/ChangeLog	2009-05-20 13:03:27 UTC (rev 3444)
@@ -1,5 +1,9 @@
 2009-05-20  Matthew Mundell <mmundell at intevation.de>
 
+	* src/tests/CMakeLists.txt (OVAS_LDFLAG): Add libopenvas.
+
+2009-05-20  Matthew Mundell <mmundell at intevation.de>
+
 	Rename make_report_id to make_report_uuid, and report_path_task_name to
 	report_path_task_uuid.
 

Modified: trunk/openvas-manager/src/tests/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/src/tests/CMakeLists.txt	2009-05-20 13:03:10 UTC (rev 3443)
+++ trunk/openvas-manager/src/tests/CMakeLists.txt	2009-05-20 13:03:27 UTC (rev 3444)
@@ -24,9 +24,17 @@
 
 ## Config
 
-#set (OVAS_LDFLAG "-lgnutls")
-set (OVAS_LDFLAG "-lsqlite3 -lgnutls")
+if (OPENVAS_LIB_INSTALL_DIR)
+  set (LIB_TEMP "-L${OPENVAS_LIB_INSTALL_DIR}")
+else (OPENVAS_LIB_INSTALL_DIR)
+  set (LIB_TEMP "")
+endif (OPENVAS_LIB_INSTALL_DIR)
 
+#set (OVAS_LDFLAG "${LIB_TEMP} -lgnutls")
+set (OVAS_LDFLAG "${LIB_TEMP} -lsqlite3 -lgnutls -lopenvas")
+
+MARK_AS_ADVANCED (LIB_TEMP)
+
 exec_program (pkg-config
               ARGS --cflags glib-2.0
 			  OUTPUT_VARIABLE GLIB_CFLAGS)