-
Notifications
You must be signed in to change notification settings - Fork 964
Various CMake updates #2394
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Various CMake updates #2394
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CMake Build System Improvements for Windows and macOS
Summary
This PR is a little bit of grab-bag of CMake updates and improvements.
Key Changes
Windows CMake Improvements
CINDER_GL_ANGLEoption/MT) for static builds, dynamic CRT (/MD) for DLL buildsmacOS GLFW High-Density Display Fix
Window::getContentScale()now correctly returns content scale for GLFW windowsWindowImplGlfwsetsGLFW_COCOA_RETINA_FRAMEBUFFERhint based on app settingsRendererImplGlfwGl::defaultResize()now correctly uses framebuffer size for viewport but window size for matricesSample Build Organization
Created
samples/_AllSamples/CMakeLists.txtas a standalone project for building all samples. The rootCMakeLists.txtnow delegates to_AllSampleswhenCINDER_BUILD_ALL_SAMPLES=ON.By default, all sample outputs go to a centralized
<build-dir>/bindirectory:To instead build each sample to its own directory (useful when working on individual samples), pass
-DCINDER_SAMPLES_INLINE_BUILD=ON:The inline layout places outputs next to each sample's source, making it easy to find and run individual samples during development. However, CMake's
cleantarget only removes files (not directories), so.appbundle folders will remain as empty shells after cleaning.Platform-specific skip lists automatically exclude incompatible samples (D3D11 on Mac, Metal on Windows, etc.).
New
ci_require_platform()Macroci_require_platform( MSW )for Windows-only samplesmacOS Info.plist Handling
MACOSX_BUNDLE_*propertiesplutilpost-build command to setNSHighResolutionCapable=false(usingCMAKE_SYSTEM_NAMEfor portability) for most samplesHighDensityDisplaysample setsNSHighResolutionCapable=trueas it specifically tests retinaVarious Sample Bug Fixes
CanvasUiandCanvasUiMinimapcrash: movedImGui::Initialize()beforesetWindowSize()to prevent draw calls before initializationlibpng.libdependency.mmfilesUsage
Build all samples (centralized output):
Build all samples (inline output):
Build from
_AllSamplesdirectly: