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

Merge develop into master for milestone 2.2.0 #34

Merged
merged 24 commits into from
May 15, 2021
Merged

Merge develop into master for milestone 2.2.0 #34

merged 24 commits into from
May 15, 2021

Conversation

demianmnave
Copy link
Owner

Closes #27, #29, #30, #31

demianmnave and others added 23 commits August 1, 2020 22:19
…e custom_target to see headers in an IDE, and changed to use CMake C++ feature tests
* Tidy up the CMake build, add an installation option, tidy up AppVeyor using the Ninja CMake generator, and fix _source_group(...)_ usage

Closes #27, #29, #30, #31

* Restore Visual Studio build functionality, and add GCC and Clang entries for testing

* Use pwsh for the test_script, fix the Visual Studio generator specifications, and set the CMAKE_BUILD_TYPE for the Ubuntu bulds

* Remove spaces from the CMake arch and toolset, as this seems to confuse CMake when called from pwsh

* Move CMAKE_BUILD_TYPE back under the Ubuntu builds, specify Clang and GCC command versions explicitly, and explicitly set the path before running ctest

* Enable concurrent builds for the Visual Studio generators, and only change to the "build" directory if not already there
@demianmnave demianmnave self-assigned this May 14, 2021
@demianmnave demianmnave added this to the v2.2.0 milestone May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

source_group() settings are wrong for non-IDE builds
2 participants