mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-02 06:03:50 +00:00
ec85543d07
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
17 lines
655 B
Plaintext
17 lines
655 B
Plaintext
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})
|