-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from MassOS-Linux/development
Release MassOS 2022.09
- Loading branch information
Showing
39 changed files
with
2,366 additions
and
3,456 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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
This file contains 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
This file was deleted.
Oops, something went wrong.
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From b70acc040d0aebf124fed290d5a57ef242405d4c Mon Sep 17 00:00:00 2001 | ||
From: Kargatum <[email protected]> | ||
Date: Mon, 22 Aug 2022 03:30:15 -0400 | ||
Subject: [PATCH] FindBoost: Add support for Boost 1.80 | ||
|
||
--- | ||
Modules/FindBoost.cmake | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake | ||
index 0f407c8c68..0cea239ac9 100644 | ||
--- a/Modules/FindBoost.cmake | ||
+++ b/Modules/FindBoost.cmake | ||
@@ -1380,7 +1380,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) | ||
set(_Boost_TIMER_DEPENDENCIES chrono) | ||
set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) | ||
set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) | ||
- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.80.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) | ||
+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.81.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) | ||
message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") | ||
endif() | ||
endif() | ||
@@ -1653,7 +1653,7 @@ else() | ||
# _Boost_COMPONENT_HEADERS. See the instructions at the top of | ||
# _Boost_COMPONENT_DEPENDENCIES. | ||
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} | ||
- "1.79.0" "1.79" | ||
+ "1.80.0" "1.80" "1.79.0" "1.79" | ||
"1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" | ||
"1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" | ||
"1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" | ||
-- | ||
GitLab | ||
|
Oops, something went wrong.