Details

Reviewers

Brecht Van Lommel (brecht)
Ray Molenkamp (LazyDodo)
Ankit Meel (ankitm)

Commits

rC3af4a7fa80e0: Xcode: support cmake options for grouping in folders
rB89014b51f127: Xcode: support cmake options for grouping in folders

Summary

I'm not familiar with Xcode yet, but I could see at first glance that this IDE can also benefit from the options:

WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS
WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS

This patch proposes the implementation of these options and also renames them as they are no longer limited to just Windows and Visual Studio.

before	after

Diff Detail

Repository

rB Blender

Branch

xcode-groups (branched from master)

Build Status

Buildable 16226
Build 16226: arc lint + arc unit

Event Timeline

Germano Cavalcante (mano-wii) requested review of this revision.Aug 4 2021, 8:45 PM

Germano Cavalcante (mano-wii) created this revision.

Harbormaster completed remote builds in B16226: Diff 40331.Aug 4 2021, 8:45 PM

Germano Cavalcante (mano-wii) edited the summary of this revision. (Show Details)Aug 4 2021, 8:53 PM

Adding Windows platform since this changes the names of the Windows options.

CMakeLists.txt
629	WINDOWS -> IDE

This revision now requires changes to proceed.Aug 4 2021, 8:59 PM

You missed one more use inside intern\cycles\cmake\macros.cmake

CMakeLists.txt
629	`mark_as_advanced(IDE_GROUP_PROJECT_FOLDERS )` ?
632	This was being controlled from `platform_win32.cmake` this can be removed there

Ray Molenkamp (LazyDodo) requested changes to this revision.Aug 4 2021, 9:00 PM

Remove control in platform_win32.cmake
WINDOWS -> IDE

Harbormaster completed remote builds in B16229: Diff 40334.Aug 4 2021, 9:18 PM

IDE_GROUP_SOURCE_FOLDERS -> IDE_GROUP_SOURCES_IN_FOLDERS
IDE_GROUP_PROJECT_FOLDERS -> IDE_GROUP_PROJECTS_IN_FOLDERS

Harbormaster completed remote builds in B16230: Diff 40335.Aug 4 2021, 9:26 PM

Does this affect only one directory level ?
See intern (nice folder) > bf_intern_* (we're back to targets)

Ignore my last comment.
This looks fine to me.

@Ankit Meel (ankitm), thanks for checking!
I believe the patch is ready and fine.
I'm just not sure if the IDE name for cmake's new Group Entry is a good choice. (GENERATOR would be my second choice).
Anyway, in case nobody finds a problem, I intend to commit the way it is ;)

Brecht Van Lommel (brecht) accepted this revision.Aug 5 2021, 5:38 PM

There's still one use of of the old variable name left in intern\cycles\cmake\macros.cmake

This revision now requires changes to proceed.Aug 5 2021, 5:41 PM