Make Spicy version available to subprojects.

Author: rsmmr

CMakeLists.txt

@@ -167,6 +167,12 @@ endif ()
 # Set up testing infrastructure.
 enable_testing()
 
+# Compute project version.
+execute_process(COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/autogen-version --cmake --git-root ${CMAKE_CURRENT_SOURCE_DIR} --store ${CMAKE_SOURCE_DIR}/VERSION
+    OUTPUT_VARIABLE SPICY_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(CMAKE_PROJECT_VERSION ${SPICY_VERSION})
+
 # Add subdirectories.
 add_subdirectory(hilti)
 add_subdirectory(spicy)
@@ -185,12 +191,6 @@ endif ()
 
 add_subdirectory(3rdparty)
 
-# Compute project version.
-execute_process(COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/autogen-version --cmake --git-root ${CMAKE_CURRENT_SOURCE_DIR} --store ${CMAKE_SOURCE_DIR}/VERSION
-    OUTPUT_VARIABLE SPICY_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-set(CMAKE_PROJECT_VERSION ${SPICY_VERSION})
-
 ## Print build summary
 string(TOUPPER ${CMAKE_BUILD_TYPE} BuildType)
 

zeek/CMakeLists.txt

@@ -10,6 +10,12 @@ set(SPICY_CONFIG  "${CMAKE_BINARY_DIR}/bin/spicy-config" CACHE FILEPATH "")
 set(ZEEK_CONFIG   "${ZEEK_CONFIG}" CACHE FILEPATH "")
 set(ZEEK_ROOT_DIR "${ZEEK_ROOT_DIR}" CACHE FILEPATH "")
 
+# Hand numerical version number down to subprojects.
+#
+# TODO: This is temporary, this code will be removed once the submodules get removed.
+string(REGEX MATCH "([0-9]*)\.([0-9]*)\.([0-9]*).*" _ ${CMAKE_PROJECT_VERSION})
+math(EXPR SPICY_VERSION_NUMBER "${CMAKE_MATCH_1} * 10000 + ${CMAKE_MATCH_2} * 100 + ${CMAKE_MATCH_3}")
+
 add_subdirectory(spicy-plugin)
 add_subdirectory(spicy-analyzers EXCLUDE_FROM_ALL)