DoraTargets.cmake

@@ -40,28 +40,42 @@ if(DORA_ROOT_DIR AND EXISTS "${DORA_ROOT_DIR}/Cargo.toml")
     set(dora_link_dirs ${DORA_ROOT_DIR}/target/debug)
 else()
     include(ExternalProject)
-    set(DORA_GIT_TAG "main")
+
-    find_program(DORA_CLI dora)
+    # This node targets dora 1.0+. Set DORA_GIT_TAG to pin a tag explicitly;
-    if(DORA_CLI)
+    # left empty it follows the installed dora CLI so the bindings match the
-        execute_process(
+    # runtime, and falls back to the default below when no CLI is present.
-            COMMAND ${DORA_CLI} --version
+    set(DORA_GIT_TAG "" CACHE STRING "dora-rs git tag to build against (empty: follow the dora CLI)")
-            RESULT_VARIABLE _dora_version_result
+    set(_dora_tag "${DORA_GIT_TAG}")
-            OUTPUT_VARIABLE _dora_version_out
+
-            ERROR_VARIABLE _dora_version_err
+    if(NOT _dora_tag)
-            OUTPUT_STRIP_TRAILING_WHITESPACE
+        set(_dora_tag "v1.0.1")
-        )
+        find_program(DORA_CLI dora)
-        if(_dora_version_result EQUAL 0)
+        if(DORA_CLI)
-            string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" _dora_version_match "${_dora_version_out}")
+            execute_process(
-            if(_dora_version_match)
+                COMMAND ${DORA_CLI} --version
-                set(DORA_GIT_TAG "v${CMAKE_MATCH_1}")
+                RESULT_VARIABLE _dora_version_result
+                OUTPUT_VARIABLE _dora_version_out
+                ERROR_VARIABLE _dora_version_err
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+            if(_dora_version_result EQUAL 0)
+                string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" _dora_version_match "${_dora_version_out}")
+                if(_dora_version_match)
+                    set(_dora_tag "v${CMAKE_MATCH_1}")
+                    if(CMAKE_MATCH_1 VERSION_LESS 1.0)
+                        message(WARNING "dora CLI ${CMAKE_MATCH_1} is older than the 1.0 this node targets")
+                    endif()
+                endif()
             endif()
         endif()
     endif()
 
+    message(STATUS "dora-rs: building C++ bindings from ${_dora_tag}")
+
     ExternalProject_Add(Dora
         PREFIX ${CMAKE_CURRENT_BINARY_DIR}/dora
         GIT_REPOSITORY https://github.com/dora-rs/dora.git
-        GIT_TAG ${DORA_GIT_TAG}
+        GIT_TAG ${_dora_tag}
         BUILD_IN_SOURCE True
         CONFIGURE_COMMAND ""
         BUILD_COMMAND