Changeset 7151

Timestamp:

Jun 23, 2010, 6:32:14 PM (14 years ago)

Author:

rgrieder

Message:

Updated ENet version finding and added a warning for versions ≥ 1.3, which are not protocol compatible with 1.1 and 1.2.

Location:

code/branches/presentation3/cmake/tools

Files:

• DetermineVersion.cmake (modified) (1 diff)
• FindENet.cmake (modified) (2 diffs)

code/branches/presentation3/cmake/tools/DetermineVersion.cmake

@@ -22 +22 @@
  #  Description:
  #    Inspects a given file for the following expressions
- #    "NAME_MAJOR_VERSION #"
- #    "NAME_MINOR_VERSION #"
- #    "NAME_PATCH_VERSION #"
+ #    "NAME_VERSION_MAJOR #"
+ #    "NAME_VERSION_MINOR #"
+ #    "NAME_VERSION_PATCH #"
  #    and sets NAME_VERSION accordingly. NAME_PART_VERSION variables are also
  #    set. If you wish to look for different parts (e.g. "first" "second", etc.)

code/branches/presentation3/cmake/tools/FindENet.cmake

@@ -34 +34 @@
 )
 
-# Try to determine the version. Note that enet only stores the major
-# version in the header file. So we check for existing functions.
-# Hence the this script only distinguishes between 1.0, 1.1 and 1.2
-FILE(STRINGS ${ENET_INCLUDE_DIR}/enet/enet.h _enet_header REGEX "ENET_")
-IF(_enet_header MATCHES "ENET_VERSION[ \t]*=[ \t]*1")
-  IF(_enet_header MATCHES "enet_socket_set_option")
-    SET(ENET_VERSION 1.2)
-  ELSEIF(_enet_header MATCHES "enet_peer_disconnect_later")
-    SET(ENET_VERSION 1.1)
+# Only works for 1.2.2 and higher, otherwise see below
+DETERMINE_VERSION(ENET ${ENET_INCLUDE_DIR}/enet/enet.h)
+IF(${ENET_VERSION} STREQUAL "0.0.0")
+  # Try to determine the version. Note that enet only stores the major
+  # version in the header file. So we check for existing functions.
+  # Hence the this script only distinguishes between 1.0, 1.1 and 1.2
+  FILE(STRINGS ${ENET_INCLUDE_DIR}/enet/enet.h _enet_header REGEX "ENET_")
+  IF(_enet_header MATCHES "ENET_VERSION[ \t]*=[ \t]*1")
+    IF(_enet_header MATCHES "enet_socket_set_option")
+      SET(ENET_VERSION 1.2)
+    ELSEIF(_enet_header MATCHES "enet_peer_disconnect_later")
+      SET(ENET_VERSION 1.1)
+    ELSE()
+      SET(ENET_VERSION 1.0)
+    ENDIF()
   ELSE()
-    SET(ENET_VERSION 1.0)
+    SET(ENET_VERSION 0) # Script doesn't support versions below 1.0
   ENDIF()
-ELSE()
-  SET(ENET_VERSION 0) # Script doesn't support versions below 1.0
 ENDIF()
 
@@ -56 +60 @@
   ENET_INCLUDE_DIR
 )
+
+COMPARE_VERSION_STRINGS(${ENET_VERSION} 1.2 _comparison TRUE)
+IF(${_comparison} EQUAL 1)
+  MESSAGE(STATUS "Warning: Using ENet version 1.3, which is not protocol compatible with 1.1 and 1.2.")
+ENDIF()
 
 # Collect optimized and debug libraries