Changeset 19777 for trunk

Timestamp:

10/15/19 16:19:25 (5 years ago)

Author:

tbretz

Message:

ROOT_VERSION must not be a list when evaluated with VERSION_GREATER_EQUAL

File:

• trunk/Mars/CMakeLists.txt (modified) (1 diff)

trunk/Mars/CMakeLists.txt

@@ -150 +150 @@
 ENDIF()
 
+# Replace separators to make the version consistent
+# (older version might use the '/')
+STRING(REPLACE "/" "." ROOT_VERSION ${ROOT_VERSION})
+
 # This happens when root is used from its build directory
+# Create the version components manually
 IF(ROOT_VERSION AND NOT ROOT_VERSION_MAJOR)
-# Replace separators (older version might use the '/')
-STRING(REPLACE "/" "." ROOT_VERSION ${ROOT_VERSION})
-STRING(REPLACE "." ";" ROOT_VERSION ${ROOT_VERSION})
-# Split version string
-LIST(GET ROOT_VERSION 0 ROOT_VERSION_MAJOR)
-LIST(GET ROOT_VERSION 1 ROOT_VERSION_MINOR)
-LIST(GET ROOT_VERSION 2 ROOT_VERSION_PATCH)
-# Remove trailing 0's
-STRING(REGEX REPLACE "0+([0-9]+)" "\\1" ROOT_VERSION_MINOR ${ROOT_VERSION_MINOR})
-STRING(REGEX REPLACE "0+([0-9]+)" "\\1" ROOT_VERSION_PATCH ${ROOT_VERSION_PATCH})
+   # Create a list of components
+   STRING(REPLACE "." ";" ROOT_VERSION_LIST ${ROOT_VERSION})
+   # Split version string
+   LIST(GET ROOT_VERSION_LIST 0 ROOT_VERSION_MAJOR)
+   LIST(GET ROOT_VERSION_LIST 1 ROOT_VERSION_MINOR)
+   LIST(GET ROOT_VERSION_LIST 2 ROOT_VERSION_PATCH)
+   # Remove trailing 0's
+   STRING(REGEX REPLACE "0+([0-9]+)" "\\1" ROOT_VERSION_MINOR ${ROOT_VERSION_MINOR})
+   STRING(REGEX REPLACE "0+([0-9]+)" "\\1" ROOT_VERSION_PATCH ${ROOT_VERSION_PATCH})
 ENDIF()