Page MenuHomeFreeBSD
Files F151657292

D15878.id44103.diff
No OneTemporary
Actions

D15878.id44103.diff
View Options

Index: head/games/spring/files/patch-rts-build-cmake-Util
===================================================================
--- head/games/spring/files/patch-rts-build-cmake-Util
+++ head/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 @@
...
---- 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}}")
Index: head/games/spring/files/patch-rts-build-cmake-UtilJava
===================================================================
--- head/games/spring/files/patch-rts-build-cmake-UtilJava
+++ head/games/spring/files/patch-rts-build-cmake-UtilJava
@@ -0,0 +1,16 @@
+CMake 3.12 errors on FOLLOW_SYMLINKS (which was never supported for
+file(GLOB ...) anyway, but was ignored).
+
+See also https://springrts.com/mantis/view.php?id=6005
+
+--- ./rts/build/cmake/UtilJava.cmake.bak 2014-10-07 22:09:51 UTC
++++ ./rts/build/cmake/UtilJava.cmake
+@@ -45,7 +45,7 @@
+ # Returns the name of the first sub-dir (in alphabetical descending order)
+ # under dir.
+ macro (GetFirstSubDirName name_var dir)
+- file(GLOB dirContent RELATIVE "${dir}" FOLLOW_SYMLINKS "${dir}/*")
++ file(GLOB dirContent RELATIVE "${dir}" "${dir}/*")
+ foreach (dirPart ${dirContent})
+ if (IS_DIRECTORY "${dir}/${dirPart}")
+ set(${name_var} ${dirPart})

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 10, 7:59 PM (33 m, 15 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31242482
Default Alt Text
D15878.id44103.diff (2 KB)

Event Timeline