[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/cmake/modules
From:       Jos van den Oever <jos () vandenoever ! info>
Date:       2009-08-24 12:25:49
Message-ID: 1251116749.062797.26567.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1015065 by vandenoever:

Fix FindWV2 to require the trunk version of wv2.

 M  +11 -7     FindWV2.cmake  


--- trunk/koffice/cmake/modules/FindWV2.cmake #1015064:1015065
@@ -5,11 +5,13 @@
 #  WV2_INCLUDE_DIR - the WV2 include directory
 #  WV2_LIBRARIES - The libraries needed to use WV2
 
-IF (WV2_LIBRARIES AND WV2_INCLUDE_DIR)
+IF (WV2_LIBRARIES AND WV2_INCLUDE_DIR AND WV2_VERSION)
   # in cache already
-  SET(WV2_FOUND TRUE)
+  IF (WV2_VERSION STREQUAL "0.3.1")
+    SET(WV2_FOUND TRUE)
+  ENDIF (WV2_VERSION STREQUAL "0.3.1")
 
-ELSE (WV2_LIBRARIES AND WV2_INCLUDE_DIR)
+ELSE (WV2_LIBRARIES AND WV2_INCLUDE_DIR AND WV2_VERSION)
 	
   FIND_PROGRAM(WV2CONFIG_EXECUTABLE NAMES wv2-config )
 
@@ -19,9 +21,11 @@
 
     EXEC_PROGRAM(${WV2CONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE \
OUTPUT_VARIABLE WV2_INCLUDE_DIR)  
-    IF (WV2_LIBRARIES AND WV2_INCLUDE_DIR)
-      SET(WV2_FOUND TRUE)
-    ENDIF (WV2_LIBRARIES AND WV2_INCLUDE_DIR)
+    IF (WV2_LIBRARIES AND WV2_INCLUDE_DIR AND WV2_VERSION)
+      IF (WV2_VERSION STREQUAL "0.3.1")
+        SET(WV2_FOUND TRUE)
+      ENDIF (WV2_VERSION STREQUAL "0.3.1")
+    ENDIF (WV2_LIBRARIES AND WV2_INCLUDE_DIR AND WV2_VERSION)
 
     # ensure that they are cached
     set(WV2_INCLUDE_DIR ${WV2_INCLUDE_DIR} CACHE INTERNAL "The wv2 include path")
@@ -39,7 +43,7 @@
     endif (WV2_FIND_REQUIRED)
   endif (WV2_FOUND)
 
-ENDIF (WV2_LIBRARIES AND WV2_INCLUDE_DIR)
+ENDIF (WV2_LIBRARIES AND WV2_INCLUDE_DIR AND WV2_VERSION)
 
 MACRO_LOG_FEATURE(WV2_FOUND "wv2 libraries" "Library that interprets MS Office \
files. You need this for reading word/powerpoint files" \
"http://sf.net/projects/wvware/")  


[prev in list] [next in list] [prev in thread] [next in thread]