[Openvas-commits] r13690 - in trunk/openvas-administrator: . src/tests
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Fri Jul 6 11:22:47 CEST 2012
Author: mwiegand
Date: 2012-07-06 11:22:47 +0200 (Fri, 06 Jul 2012)
New Revision: 13690
Modified:
trunk/openvas-administrator/ChangeLog
trunk/openvas-administrator/src/tests/CMakeLists.txt
Log:
* src/tests/CMakeLists.txt: Ensure that linking with modern gccs works
by moving linker flags from LINK_FLAGS to target_link_libraries.
Modified: trunk/openvas-administrator/ChangeLog
===================================================================
--- trunk/openvas-administrator/ChangeLog 2012-07-06 09:16:01 UTC (rev 13689)
+++ trunk/openvas-administrator/ChangeLog 2012-07-06 09:22:47 UTC (rev 13690)
@@ -1,3 +1,8 @@
+2012-07-06 Michael Wiegand <michael.wiegand at greenbone.net>
+
+ * src/tests/CMakeLists.txt: Ensure that linking with modern gccs works
+ by moving linker flags from LINK_FLAGS to target_link_libraries.
+
2012-04-23 Michael Wiegand <michael.wiegand at greenbone.net>
* src/admin.c (openvas_get_sync_script_identification): Replace calls
Modified: trunk/openvas-administrator/src/tests/CMakeLists.txt
===================================================================
--- trunk/openvas-administrator/src/tests/CMakeLists.txt 2012-07-06 09:16:01 UTC (rev 13689)
+++ trunk/openvas-administrator/src/tests/CMakeLists.txt 2012-07-06 09:22:47 UTC (rev 13690)
@@ -66,82 +66,69 @@
add_executable (oap_authenticate_0 oap_authenticate_0.c)
set_target_properties (oap_authenticate_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_authenticate_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_authenticate_0 common)
+target_link_libraries (oap_authenticate_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_authenticate_0 oap_authenticate_0)
add_executable (oap_bogus_0 oap_bogus_0.c)
set_target_properties (oap_bogus_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_bogus_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_bogus_0 common)
+target_link_libraries (oap_bogus_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_bogus_0 oap_bogus_0)
add_executable (oap_bogus_1 oap_bogus_1.c)
set_target_properties (oap_bogus_1 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_bogus_1 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_bogus_1 common)
+target_link_libraries (oap_bogus_1 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_bogus_1 oap_bogus_1)
add_executable (oap_commands_0 oap_commands_0.c)
set_target_properties (oap_commands_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_commands_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_commands_0 common)
+target_link_libraries (oap_commands_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_commands_0 oap_commands_0)
add_executable (oap_create_user_0 oap_create_user_0.c)
set_target_properties (oap_create_user_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_create_user_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_create_user_0 common)
+target_link_libraries (oap_create_user_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_create_user_0 oap_create_user_0)
add_executable (oap_delete_user_0 oap_delete_user_0.c)
set_target_properties (oap_delete_user_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_delete_user_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_delete_user_0 common)
+target_link_libraries (oap_delete_user_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_delete_user_0 oap_delete_user_0)
add_executable (oap_delete_user_1 oap_delete_user_1.c)
set_target_properties (oap_delete_user_1 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_delete_user_1 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_delete_user_1 common)
+target_link_libraries (oap_delete_user_1 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_delete_user_1 oap_delete_user_1)
add_executable (oap_get_users_0 oap_get_users_0.c)
set_target_properties (oap_get_users_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_get_users_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_get_users_0 common)
+target_link_libraries (oap_get_users_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_get_users_0 oap_get_users_0)
add_executable (oap_get_version_0 oap_get_version_0.c)
set_target_properties (oap_get_version_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_get_version_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_get_version_0 common)
+target_link_libraries (oap_get_version_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_get_version_0 oap_get_version_0)
add_executable (oap_help_0 oap_help_0.c)
set_target_properties (oap_help_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_help_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_help_0 common)
+target_link_libraries (oap_help_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_help_0 oap_help_0)
add_executable (oap_help_1 oap_help_1.c)
set_target_properties (oap_help_1 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (oap_help_1 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (oap_help_1 common)
+target_link_libraries (oap_help_1 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (oap_help_1 oap_help_1)
## Tests of the administrator
add_executable (read_protocol_0 read_protocol_0.c)
set_target_properties (read_protocol_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (read_protocol_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (read_protocol_0 common)
+target_link_libraries (read_protocol_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (read_protocol_0 read_protocol_0)
add_executable (timeout_0 timeout_0.c)
set_target_properties (timeout_0 PROPERTIES COMPILE_FLAGS "${GLIB_CFLAGS} ${OVAS_CFLAGS}")
-set_target_properties (timeout_0 PROPERTIES LINK_FLAGS "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
-target_link_libraries (timeout_0 common)
+target_link_libraries (timeout_0 common "${OVAS_LDFLAG} ${GLIB_LDFLAGS}")
ADD_TEST (timeout_0 timeout_0)
## End
More information about the Openvas-commits
mailing list