Skip to content
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

Prefix CMake options with FLAMEGPU_ + use mark_as_advanced #110

Merged
merged 1 commit into from
Dec 8, 2022

Conversation

ptheywood
Copy link
Member

@ptheywood ptheywood commented Nov 22, 2022

Prefixes CMake options / cache variables with FLAMEGPU_ and cleans up the CMake UI via mark_as_advanced.

Switches from CUDA_ARCH to the native CMAKE_CUDA_ARCHITECTURES

Required by FLAMEGPU/FLAMEGPU2#991

src/CMakeLists.txt Outdated Show resolved Hide resolved
@ptheywood ptheywood marked this pull request as ready for review November 30, 2022 22:10
Copy link
Member

@Robadob Robadob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto main repo PR

…ovments

+ Prefixes CMake option and cache variables with FLAMEGPU_VISUALISER
+ Prefix CMake macros and functions with flamegpu_visualiser_ and use lower snake case
+ Remove unneeded reference to SEATBELTS from CMake
+ Mark many CMake variables as advanced to simplify the CMake GUI
+ Fix cmake_minimimum_requires statemeents and add a policy_max of 3.25
  + This requied a fix for a CMake 3.21 policy
+ Use more-modern CMake C++/CUDA standard setting
+ Modernise/simplify GLM CMake and use PUBLIC/PRIVATE target_link_libraries
+ Provide list of DLLs via flamegpu_visualiser_get_runtime_depenencies to simplify code in FLAMEGPU/FLAMEGPU2
@ptheywood
Copy link
Member Author

Just pushed a minor fix / improvement to the cuda architectures setting logic, so that if you specify via the CLI the GUI becomes aware of the value (I'd reduced some duplication at one point, but not correctly changed the logic for all branches to work).

Otherwise once CI is happy I'll merge this so I can update the hash in the main repo PR too so that can then rerun CI and should be mergable.

@ptheywood ptheywood merged commit b858b86 into master Dec 8, 2022
@ptheywood ptheywood deleted the cmake-option-prefixing branch December 8, 2022 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants