-
Notifications
You must be signed in to change notification settings - Fork 6
Add webifc to superbuild #304
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| diff --git a/src/cpp/web-ifc/geometry/IfcGeometryLoader.cpp b/src/cpp/web-ifc/geometry/IfcGeometryLoader.cpp | ||
| index ebfaf3f2..13ef5d50 100644 | ||
| --- a/src/cpp/web-ifc/geometry/IfcGeometryLoader.cpp | ||
| +++ b/src/cpp/web-ifc/geometry/IfcGeometryLoader.cpp | ||
| @@ -4,6 +4,7 @@ | ||
|
|
||
| #include <spdlog/spdlog.h> | ||
| #include <iomanip> | ||
| +#include <sstream> | ||
| #include "IfcGeometryLoader.h" | ||
| #include "operations/curve-utils.h" | ||
| #include "operations/geometryutils.h" | ||
| diff --git a/src/cpp/web-ifc/parsing/IfcLoader.cpp b/src/cpp/web-ifc/parsing/IfcLoader.cpp | ||
| index ae592775..4cb54410 100644 | ||
| --- a/src/cpp/web-ifc/parsing/IfcLoader.cpp | ||
| +++ b/src/cpp/web-ifc/parsing/IfcLoader.cpp | ||
| @@ -6,7 +6,8 @@ | ||
| #include <string> | ||
| #include <cmath> | ||
| #include <algorithm> | ||
| -#include <format> | ||
| +#include <charconv> | ||
| +#include <array> | ||
| #include <fast_float/fast_float.h> | ||
| #include <spdlog/spdlog.h> | ||
| #include "IfcLoader.h" | ||
| @@ -354,7 +355,9 @@ namespace webifc::parsing { | ||
|
|
||
| void IfcLoader::PushDouble(double input) | ||
| { | ||
| - std::string numberString = std::format("{}", input); | ||
| + std::array<char, 64> buf; | ||
| + auto [ptr, ec] = std::to_chars(buf.data(), buf.data() + buf.size(), input); | ||
| + std::string numberString(buf.data(), ptr); | ||
| size_t eLoc = numberString.find_first_of('e'); | ||
| if (eLoc != std::string::npos) numberString[eLoc]='E'; | ||
| else if (std::floor(input) == input) numberString+='.'; | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| superbuild_add_project(webifc | ||
| BUILD_SHARED_LIBS_INDEPENDENT | ||
| LICENSE_FILES | ||
| LICENSE.md | ||
| SOURCE_SUBDIR src/cpp | ||
| CMAKE_ARGS | ||
| -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON) | ||
|
|
||
| superbuild_apply_patch(webifc remove-std-format | ||
| "Replace std::format with std::to_chars for compiler compatibility") |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is webifc C++20 ? I dont think they advertise it, maybe we should ask if they want this patch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
they have
set(CMAKE_CXX_STANDARD 20)in their cmakelists so it seems they areThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
however, format is the only c++20 usage
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
got it, ill ask them on their forum then
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no answer yet, ill let uyou know if they do.