Changeset 2577

Timestamp:

Jan 7, 2009, 1:22:33 PM (16 years ago)

Author:

rgrieder

Message:

Improved DetermineVersion.cmake

Location:

code/branches/buildsystem2/cmake

Files:

• DetermineVersion.cmake (modified) (1 diff)
• FindCEGUI.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/DetermineVersion.cmake

@@ -17 +17 @@
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-MACRO(DetermineVersion _name _file _version_var)
+MACRO(DetermineVersion _name _file)
   FILE(READ ${_file} _file_content)
   IF(_file_content)
-    STRING(REGEX MATCH "${_name}_VERSION_MAJOR +([0-9]+)" _dummyvar ${_file_content})
-    SET(_version "${CMAKE_MATCH_1}")
-    STRING(REGEX MATCH "${_name}_VERSION_MINOR +([0-9]+)" _dummyvar ${_file_content})
-    SET(_version "${_version}.${CMAKE_MATCH_1}")
-    STRING(REGEX MATCH "${_name}_VERSION_PATCH +([0-9]+)" _dummyvar ${_file_content})
-    SET(_version "${_version}.${CMAKE_MATCH_1}")
-    SET(${_version_var} "${_version}")
+    SET(_parts ${ARGN})
+    LIST(LENGTH _parts _parts_length)
+    IF(NOT ${_parts_length} EQUAL 3)
+      SET(_parts MAJOR MINOR PATCH)
+    ENDIF(NOT ${_parts_length} EQUAL 3)
+
+    FOREACH(_part ${_parts})
+      STRING(REGEX MATCH "${_name}_VERSION_${_part} +([0-9]+)" _match ${_file_content})
+      IF(_match)
+        SET(${_name}_VERSION_${_part} ${CMAKE_MATCH_1} CACHE STRING "")
+      ELSE(_match)
+        SET(${_name}_VERSION_${_part} "0" CACHE STRING "")
+      ENDIF(_match)
+      MARK_AS_ADVANCED(${_name}_VERSION_${_part})
+      IF("${_parts}" MATCHES "^${_part}") # First?
+        SET(${_name}_VERSION "${${_name}_VERSION_${_part}}" CACHE STRING "" FORCE)
+      ELSE("${_parts}" MATCHES "^${_part}")
+        SET(${_name}_VERSION "${${_name}_VERSION}.${${_name}_VERSION_${_part}}" CACHE STRING "" FORCE)
+      ENDIF("${_parts}" MATCHES "^${_part}")
+    ENDFOREACH(_part)
+    MARK_AS_ADVANCED(${_name}_VERSION)
   ENDIF(_file_content)
 ENDMACRO(DetermineVersion)

code/branches/buildsystem2/cmake/FindCEGUI.cmake

@@ -60 +60 @@
 # Look in CEGUIVersion.h for the version number
 INCLUDE(DetermineVersion)
-DetermineVersion(CEGUI ${CEGUI_INCLUDE_DIR}/CEGUIVersion.h _CEGUI_VERSION_temp)
-SET(CEGUI_VERSION "${_CEGUI_VERSION_temp}" CACHE STRING "")
+DetermineVersion(CEGUI ${CEGUI_INCLUDE_DIR}/CEGUIVersion.h)
 # STRLESS can be dangerous since it only compares strings.
-# Howerver VERSION_LESS seems to be having serious issues.
+# Unfortunately VERSION_LESS is only provided since CMake v2.6.2
 IF(${CEGUI_VERSION} STRLESS "0.5.0")
    MESSAGE(FATAL_ERROR "Minimum CEGUI version required is 0.5.0")