diff options
| author | adridg <adridg@FreeBSD.org> | 2018-06-20 05:08:33 +0800 |
|---|---|---|
| committer | adridg <adridg@FreeBSD.org> | 2018-06-20 05:08:33 +0800 |
| commit | 765d4dac9447f9bdd3d11e61514a11add0d1e61c (patch) | |
| tree | 4116f63a2b1da602693ffee669950c12fae2cb7b | |
| parent | e8865dd3f5d47c629f75533a4475180a5cf943cd (diff) | |
| download | freebsd-ports-gnome-765d4dac9447f9bdd3d11e61514a11add0d1e61c.tar.gz freebsd-ports-gnome-765d4dac9447f9bdd3d11e61514a11add0d1e61c.tar.zst freebsd-ports-gnome-765d4dac9447f9bdd3d11e61514a11add0d1e61c.zip | |
Pre-emptively fix games/spring before CMake 3.12 arrives.
file(GLOB .. FOLLOW_SYMLINKS ..) was never documented to work; in
3.12-rc1 this has become an error. That in itself is considered
a regression in CMake [1], but the use is wrong anyway, so patch
it away. The change has been accepted upstream [2] already.
Not bumping PORTREVISION because no code actually changes,
it just removes a cmake-time no-op.
[1] https://gitlab.kitware.com/cmake/cmake/issues/18097
[2] https://springrts.com/mantis/view.php?id=6005
PR: 229101
Reviewed by: tcberner
Differential Revision: https://reviews.freebsd.org/D15878
| -rw-r--r-- | games/spring/files/patch-rts-build-cmake-Util | 10 | ||||
| -rw-r--r-- | games/spring/files/patch-rts-build-cmake-UtilJava | 16 |
2 files changed, 23 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}}") diff --git a/games/spring/files/patch-rts-build-cmake-UtilJava b/games/spring/files/patch-rts-build-cmake-UtilJava new file mode 100644 index 000000000000..36577677252d --- /dev/null +++ b/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}) |