mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'source_group-tree' into release-3.16

Browse Source 
Merge-request: !3979
This commit is contained in:
Brad King
2019-11-05 11:31:16 -05:00
parent 408a3a7d5e 3c0ca5a9d9
commit 0ec60a4002
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmSourceGroupCommand.cxx
View File

@@ -78,10 +78,18 @@ std::vector<std::string> prepareFilesPathsForTree(
for (auto const& filePath : filesPaths) {
std::string fullPath =
cmSystemTools::CollapseFullPath(filePath, currentSourceDir);
// If provided file path is actually not a file, silently ignore it.
if (cmSystemTools::FileExists(fullPath, /*isFile=*/true)) {
prepared.emplace_back(std::move(fullPath));
// If provided file path is actually not a directory, silently ignore it.
if (cmSystemTools::FileIsDirectory(fullPath)) {
continue;
}
// Handle directory that doesn't exist yet.
if (!fullPath.empty() &&
(fullPath.back() == '/' || fullPath.back() == '\\')) {
continue;
}
prepared.emplace_back(std::move(fullPath));
}
return prepared;

1
Tests/RunCMake/VS10Project/SourceGroupTreeCMakeLists-check.cmake
View File

@@ -13,6 +13,7 @@ include(${RunCMake_TEST_SOURCE_DIR}/SourceGroupHelpers.cmake)
set(SOURCE_GROUPS_TO_FIND
"Dir"
"Dir\\DirNested"
"Generated"
"SourcesPrefix"
"SourcesPrefix\\PrefixedNested"
)

33
Tests/RunCMake/VS10Project/SourceGroupTreeCMakeLists.cmake
View File

@@ -1,16 +1,45 @@
set(CMAKE_CONFIGURATION_TYPES Debug)
# Test regular tree grouping.
set(SRC_FILES
${CMAKE_CURRENT_SOURCE_DIR}/Dir/foo.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Dir/DirNested/foo_nested.cpp
)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SRC_FILES})
# Test files that are not present at configuration time.
set(GENERATED_SRC_FILES
${CMAKE_CURRENT_BINARY_DIR}/Generated/generated.cpp
)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Generated)
if(WIN32)
add_custom_command(OUTPUT ${GENERATED_SRC_FILES}
COMMAND echo. 2>${CMAKE_CURRENT_BINARY_DIR}\\Generated\\generated.cpp
)
else()
add_custom_command(OUTPUT ${GENERATED_SRC_FILES}
COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/Generated/generated.cpp
)
endif()
source_group(TREE ${CMAKE_CURRENT_BINARY_DIR} FILES ${GENERATED_SRC_FILES})
# Test prefixed tree grouping.
set(PREFIXED_SRC_FILES
${CMAKE_CURRENT_SOURCE_DIR}/Prefixed/bar.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Prefixed/PrefixedNested/bar_nested.cpp
)
add_custom_target(SourceGroupTree SOURCES ${SRC_FILES} ${PREFIXED_SRC_FILES})
add_custom_target(SourceGroupTree
SOURCES
${SRC_FILES}
${GENERATED_SRC_FILES}
${PREFIXED_SRC_FILES}
)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SRC_FILES})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/Prefixed PREFIX SourcesPrefix FILES ${PREFIXED_SRC_FILES})