[Openvas-commits] r8535 - trunk/openvas-administrator

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2010-07-22 10:12:43 +0200 (Thu, 22 Jul 2010)
New Revision: 8535

Modified:
   trunk/openvas-administrator/CMakeLists.txt
   trunk/openvas-administrator/ChangeLog
Log:
* CMakeLists.txt: Fixed openvas-libraries version detection.


Modified: trunk/openvas-administrator/CMakeLists.txt
===================================================================
--- trunk/openvas-administrator/CMakeLists.txt	2010-07-22 08:10:05 UTC (rev 8534)
+++ trunk/openvas-administrator/CMakeLists.txt	2010-07-22 08:12:43 UTC (rev 8535)
@@ -218,9 +218,9 @@
                         " openvas-libraries in the system.")
 if (PATH_TO_LIBOPENVASCONFIG)
   # Obtain libopenvas version number
-  exec_program (libopenvas-config
-                ARGS --version
-                OUTPUT_VARIABLE LIBOPENVAS_VERSION)
+  execute_process (COMMAND libopenvas-config --version
+    OUTPUT_VARIABLE LIBOPENVAS_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
   # Make a (per definition: semicolon separated) list of it
   string (REGEX REPLACE "\\." ";" LO_VER ${LIBOPENVAS_VERSION})
   list (GET LO_VER 0 LO_MAJOR_VER)
@@ -230,15 +230,26 @@
   # TODO Would like something like set (MIN_LO_VER "3" "0" "1")
   #      which would then make it easier to modify these. However, had serious
   #      issues with the conditionals, thus this clumsy implementation.
-  if (   ${LO_MAJOR_VER} LESS 3
-      OR ${LO_MAJOR_VER} EQUAL 3 AND ${LO_MINOR_VER} LESS 0
-      OR ${LO_MAJOR_VER} EQUAL 3 AND ${LO_MINOR_VER} EQUAL 0 AND ${LO_PATCH_VER} LESS 6 )
-      message (FATAL_ERROR "openvas-libraries version >= 3.0.6 not found.")
-  endif (   ${LO_MAJOR_VER} LESS 3
-        OR ${LO_MAJOR_VER} EQUAL 3 AND ${LO_MINOR_VER} LESS 0
-        OR ${LO_MAJOR_VER} EQUAL 3 AND ${LO_MINOR_VER} EQUAL 0 AND ${LO_PATCH_VER} LESS 6 )
+  set (LO_MAJOR_MIN_VER 3)
+  set (LO_MINOR_MIN_VER 0)
+  set (LO_PATCH_MIN_VER 6)
+  set (LO_MAJOR_VER_FAIL FALSE)
+  set (LO_MINOR_VER_FAIL FALSE)
+  set (LO_PATCH_VER_FAIL FALSE)
+  if (${LO_MAJOR_VER} LESS ${LO_MAJOR_MIN_VER})
+    set (LO_MAJOR_VER_FAIL TRUE)
+  endif (${LO_MAJOR_VER} LESS ${LO_MAJOR_MIN_VER})
+  if (${LO_MAJOR_VER} EQUAL ${LO_MAJOR_MIN_VER} AND ${LO_MINOR_VER} LESS ${LO_MINOR_MIN_VER})
+    set (LO_MINOR_VER_FAIL TRUE)
+  endif (${LO_MAJOR_VER} EQUAL ${LO_MAJOR_MIN_VER} AND ${LO_MINOR_VER} LESS ${LO_MINOR_MIN_VER})
+  if (${LO_MAJOR_VER} EQUAL ${LO_MAJOR_MIN_VER} AND ${LO_MINOR_VER} EQUAL ${LO_MINOR_MIN_VER} AND ${LO_PATCH_VER} LESS ${LO_PATCH_MIN_VER})
+    set (LO_PATCH_VER_FAIL TRUE)
+  endif (${LO_MAJOR_VER} EQUAL ${LO_MAJOR_MIN_VER} AND ${LO_MINOR_VER} EQUAL ${LO_MINOR_MIN_VER} AND ${LO_PATCH_VER} LESS ${LO_PATCH_MIN_VER})
+  if (LO_MAJOR_VER_FAIL OR LO_MINOR_VER_FAIL OR LO_PATCH_VER_FAIL)
+    message (FATAL_ERROR "openvas-libraries version >= ${LO_MAJOR_MIN_VER}.${LO_MINOR_MIN_VER}.${LO_PATCH_MIN_VER} not found.")
+  endif (LO_MAJOR_VER_FAIL OR LO_MINOR_VER_FAIL OR LO_PATCH_VER_FAIL)
 else (PATH_TO_LIBOPENVASCONFIG)
-   message (FATAL_ERROR "openvas-libraries version >= 3.0.6 not found.")
+   message (FATAL_ERROR "Could not determine openvas-libraries version.")
 endif (PATH_TO_LIBOPENVASCONFIG)
 
 ## Version

Modified: trunk/openvas-administrator/ChangeLog
===================================================================
--- trunk/openvas-administrator/ChangeLog	2010-07-22 08:10:05 UTC (rev 8534)
+++ trunk/openvas-administrator/ChangeLog	2010-07-22 08:12:43 UTC (rev 8535)
@@ -1,3 +1,7 @@
+2010-07-22  Michael Wiegand <michael.wiegand at greenbone.net>
+
+	* CMakeLists.txt: Fixed openvas-libraries version detection.
+
 2010-07-08  Michael Wiegand <michael.wiegand at greenbone.net>
 
 	* CMakeLists.txt: Make cmake environment more flexible as discussed on