Skip to content

Updates #60

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.

Sign up for GitHub

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
vinniefalco merged 6 commits into from
Mar 17, 2020
Merged

Updates #60

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4dc3cb1
Update badges
vinniefalco Mar 17, 2020
f009232
Update CMakeLists.txt comments to clarify supported build scenarios
mloskot Mar 12, 2020
11e7252
Ignore additional CMake build directories (e.g. _build32, _build64)
mloskot Mar 12, 2020
bbfb09b
CMake project version depends on BOOST_SUPERPROJECT_VERSION
mloskot Mar 17, 2020
7eefbd8
Always build tests if BUILD_TESTING=ON
mloskot Mar 17, 2020
831cab9
Add GitHub Actions for three of all supported build scenarios
mloskot Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CMake project version depends on BOOST_SUPERPROJECT_VERSION 
Current Boost-wide convention is to call project with BOOST_SUPERPROJECT_VERSION
  • Loading branch information
@mloskot @vinniefalco
mloskot authored and vinniefalco committed Mar 17, 2020
commit bbfb09b26c8acb105c02328a9222af2af384d94f
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ if(BOOST_SUPERPROJECT_VERSION)
set(BOOST_JSON_VERSION ${BOOST_SUPERPROJECT_VERSION})
endif()

project(boost_json VERSION ${BOOST_JSON_VERSION} LANGUAGES CXX)
if (BOOST_SUPERPROJECT_VERSION)
project(boost_json VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
else()
project(boost_json VERSION "${BOOST_JSON_VERSION}" LANGUAGES CXX)
endif()

file(GLOB_RECURSE BOOST_JSON_HEADERS CONFIGURE_DEPENDS
include/boost/*.hpp
Expand Down