diff options
Diffstat (limited to 'games/spring/files/patch-rts-build-cmake-Util')
-rw-r--r-- | games/spring/files/patch-rts-build-cmake-Util | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/games/spring/files/patch-rts-build-cmake-Util b/games/spring/files/patch-rts-build-cmake-Util index af8a7b312d45..a343dfc11d89 100644 --- a/games/spring/files/patch-rts-build-cmake-Util +++ b/games/spring/files/patch-rts-build-cmake-Util @@ -1,3 +1,5 @@ +Modified for CMake 3.12 to drop FOLLOW_SYMLINKS in file(GLOB ...). + Obtained via: https://springrts.com/mantis/view.php?id=4679 From 9e0db5f602407de4e7875ca85761b41782c1bb9c Mon Sep 17 00:00:00 2001 @@ -10,13 +12,15 @@ I needed this when building on archlinux with cmake 3.1.0 where GLOB returns "/" ... ---- rts/build/cmake/Util.cmake +--- rts/build/cmake/Util.cmake.orig 2014-10-07 20:09:51 UTC +++ rts/build/cmake/Util.cmake -@@ -166,10 +166,11 @@ EndFunction (MakeGlobal) +@@ -165,11 +165,12 @@ EndFunction (MakeGlobal) + # Find all CMakeLists.txt files in sub-directories Macro (GetListOfSubModules list_var) - File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" FOLLOW_SYMLINKS "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt") +- File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" FOLLOW_SYMLINKS "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt") - ++ File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt") # Strip away the "/CMakeLists.txt" parts, so we end up with just a list of dirs, # for example: AAI;RAI;KAIK - String(REPLACE "//CMakeLists.txt" "" ${list_var} "${${list_var}}") |