Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix #6005: cmake 3.12 error
  • Loading branch information
abma authored and rt committed Jun 21, 2018
1 parent fdb0059 commit 4784a35
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rts/build/cmake/Util.cmake
Expand Up @@ -164,7 +164,7 @@ 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}" "${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
# GLOB can prefix with "//" or "/" (perhaps changed in cmake 3.1.0), this double replace will support both "//" and "/"
Expand Down
2 changes: 1 addition & 1 deletion rts/build/cmake/UtilJava.cmake
Expand Up @@ -44,7 +44,7 @@ endmacro (FindJavaLib path_var libName additionalSearchDirs)
# 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})
Expand Down

0 comments on commit 4784a35

Please sign in to comment.