try to make builds based on git clone work.

Without the --recursive flag
shlomif · Oct 25, 2020 · be1e8e9 · be1e8e9
1 parent b965936
commit be1e8e9
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/fortune-mod/CMakeLists.txt b/fortune-mod/CMakeLists.txt
@@ -105,18 +105,26 @@ SHLOMIF_FINALIZE_FLAGS()
 
 # Clone the rinutils repository with the appropriate tag.
 SET (rinutils_dir "rinutils")
-IF (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${rinutils_dir}")
+SET (rinutils_dir_absolute "${CMAKE_CURRENT_SOURCE_DIR}/${rinutils_dir}")
+SET (rinutils_inc_dir "${rinutils_dir_absolute}/rinutils/include")
+IF (NOT EXISTS "${rinutils_inc_dir}")
     EXECUTE_PROCESS(
         COMMAND "git" "clone" "-b" "0.6.0" "https://github.com/shlomif/rinutils.git" "${rinutils_dir}"
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     )
+ELSE ()
+    IF (NOT EXISTS "${rinutils_inc_dir}")
+        EXECUTE_PROCESS(
+            COMMAND "git" "submodule" "update" "--init"
+            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        )
+    ENDIF ()
 ENDIF ()
 
 find_package(Rinutils QUIET)
 IF ("${Rinutils_FOUND}")
     INCLUDE_DIRECTORIES(AFTER ${RINUTILS_INCLUDE_DIR} ${RINUTILS_INCLUDE_DIRS})
 ELSE ()
-    SET(rinutils_inc_dir "${CMAKE_CURRENT_SOURCE_DIR}/${rinutils_dir}/rinutils/include")
     IF (NOT EXISTS "${rinutils_inc_dir}")
         MESSAGE(FATAL_ERROR "Could not find rinutils anywhere - it should have been bundled in the releases' source tarball.\nAlso see: https://github.com/shlomif/fortune-mod/issues/44")
     ENDIF ()