Skip to content

Commit 4c0b9f4

Browse files
committed
Fix, github workflows fell out of ci folder
1 parent 6dee071 commit 4c0b9f4

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ set(tmp "${LINK_STATIC_RUNTIME}") # not used by clang or gcc builds
126126
# 2025-02-24 - Added - Resource projects with arbitrary files
127127
# 2025-02-24 - Removed - Site project, use a resource project instead
128128
# 2025-05-18 - Changed - Minimum required version now 3.10
129+
# 2025-06-03 - Added - Include CircleCI pipeline configurations
129130

130131

131132
#############################################################################
@@ -287,14 +288,16 @@ foreach(var ${config_defines})
287288
add_definitions(/D${var})
288289
endforeach()
289290

290-
# Setting source_group to a single space is weird and relies on Visual Studio
291-
# treating it as no group, you'd expect setting it to the empty string would
292-
# mean no group, but - just for regexes (bug?) - that causes CMake to use
291+
# Note 1: Setting source_group to a single space is weird and relies on Visual
292+
# Studio treating it as no group, you'd expect setting it to the empty string
293+
# would mean no group, but - just for regexes (bug?) - that causes CMake to use
293294
# defaults.
295+
# Note 2: If you have multiple source_group(REGULAR_EXPRESSION) commands
296+
# for the same group name, all but the last are ignored. So I fear that the
297+
# "ci" regex is going to get really ugly.
294298
source_group(" " REGULAR_EXPRESSION ".*")
295-
source_group("ci" REGULAR_EXPRESSION "\.github/.*\.yml")
299+
source_group("ci" REGULAR_EXPRESSION "\.circleci/.*|\.github/.*\.yml")
296300
source_group("ci" FILES appveyor.yml codecov.yml .travis.yml)
297-
source_group("ci" REGULAR_EXPRESSION "\.circleci/.*")
298301
source_group("vendor" REGULAR_EXPRESSION "web/(.*/)+vendor/.*")
299302

300303
if(ROOT_PROJECT)

0 commit comments

Comments
 (0)