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

List:       kde-commits
Subject:    kdesupport/soprano
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-01-28 7:45:02
Message-ID: 1264664702.535774.31914.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1081307 by trueg:

Use cmake's VERSION_ macros everywhere.
Thanks to Alberto Villa from FreeBSD for the patch.

CCMAIL: avilla@freebsd.org


 M  +3 -3      CMakeLists.txt  
 M  +2 -2      backends/redland/CMakeLists.txt  
 M  +2 -2      backends/sesame2/CMakeLists.txt  
 M  +4 -4      cmake/modules/FindCLucene.cmake  


--- trunk/kdesupport/soprano/CMakeLists.txt #1081306:1081307
@@ -7,7 +7,7 @@
 ##################  Soprano version  ################################
 set(CMAKE_SOPRANO_VERSION_MAJOR 2)
 set(CMAKE_SOPRANO_VERSION_MINOR 3)
-set(CMAKE_SOPRANO_VERSION_RELEASE 72)
+set(CMAKE_SOPRANO_VERSION_RELEASE 73)
 set(CMAKE_SOPRANO_VERSION_STRING \
"${CMAKE_SOPRANO_VERSION_MAJOR}.${CMAKE_SOPRANO_VERSION_MINOR}.${CMAKE_SOPRANO_VERSION_RELEASE}")
  
 
@@ -257,9 +257,9 @@
 
 if(NOT BUILD_RAPTOR_SERIALIZER)
   message("   * Raptor RDF serializer (missing libraptor - http://librdf.org)")
-  if(NOT SOPRANO_DISABLE_RAPTOR_PARSER AND REDLAND_FOUND AND REDLAND_VERSION STRLESS \
"1.0.6") +  if(NOT SOPRANO_DISABLE_RAPTOR_PARSER AND REDLAND_FOUND AND \
                REDLAND_VERSION VERSION_LESS "1.0.6")
     message("     (The Raptor serializer depends on librdf/redland 1.0.6 or \
                greater.")
-  endif(NOT SOPRANO_DISABLE_RAPTOR_PARSER AND REDLAND_FOUND AND REDLAND_VERSION \
STRLESS "1.0.6") +  endif(NOT SOPRANO_DISABLE_RAPTOR_PARSER AND REDLAND_FOUND AND \
REDLAND_VERSION VERSION_LESS "1.0.6")  endif(NOT BUILD_RAPTOR_SERIALIZER)
 
 if(NOT BUILD_CLUCENE_INDEX)
--- trunk/kdesupport/soprano/backends/redland/CMakeLists.txt #1081306:1081307
@@ -39,9 +39,9 @@
 
 
 if(BUILD_REDLAND_BACKEND)
-  if (RASQAL_VERSION STRLESS "0.9.15")
+  if (RASQAL_VERSION VERSION_LESS "0.9.15")
     message(STATUS "WARNING! - SPARQL ASK queries are broken in rasqal <= 0.9.14. It \
                is recommended to update to at least version 0.9.15.")
-  endif (RASQAL_VERSION STRLESS "0.9.15")
+  endif (RASQAL_VERSION VERSION_LESS "0.9.15")
 
   set(redland_backend_SRC
     redlandbackend.cpp
--- trunk/kdesupport/soprano/backends/sesame2/CMakeLists.txt #1081306:1081307
@@ -1,8 +1,8 @@
 project(soprano_sesame2)
 
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" STRLESS \
"2.6.2") +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" \
VERSION_LESS "2.6.2")  set(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} \
                ${JAVA_INCLUDE_PATH2})
-endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" STRLESS \
"2.6.2") +endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" \
VERSION_LESS "2.6.2")  
 include_directories(
   ${QT_QTCORE_INCLUDE_DIR}
--- trunk/kdesupport/soprano/cmake/modules/FindCLucene.cmake #1081306:1081307
@@ -66,14 +66,14 @@
   STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
   IF (CLMATCH)
     STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
-    IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+    IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
       MESSAGE(FATAL_ERROR " CLucene version ${CLUCENE_VERSION} is less than the \
required minimum ${CLUCENE_MIN_VERSION}")  SET(CLUCENE_GOOD_VERSION FALSE)
-    ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-    IF (CLUCENE_VERSION STREQUAL "0.9.17")
+    ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
+    IF (CLUCENE_VERSION VERSION_EQUAL "0.9.17")
       MESSAGE(FATAL_ERROR "CLucene version 0.9.17 is not supported.")
       SET(CLUCENE_GOOD_VERSION FALSE)
-    ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+    ENDIF (CLUCENE_VERSION VERSION_EQUAL "0.9.17")
   ENDIF (CLMATCH)
 ENDIF (CLUCENE_LIBRARY_DIR)
 


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