Skip to content

Fix #5435 - copy cpprestsdk_char_traits_workaround to build_dir/src so it's automatically included #5436

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
jmarrec merged 1 commit into from
Jun 17, 2025
Merged

Fix #5435 - copy cpprestsdk_char_traits_workaround to build_dir/src so it's automatically included #5436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,9 @@ find_package(jsoncpp)
find_package(fmt)
find_package(SQLite3)
find_package(cpprestsdk)
# TODO: this is a workaround for #5398, it should not be there for ever
configure_file("${PROJECT_SOURCE_DIR}/dependencies/cpprestsdk_char_traits_workaround.hpp" "${PROJECT_BINARY_DIR}/src/cpprestsdk_char_traits_workaround.hpp" COPYONLY)

find_package(websocketpp)
find_package(Boost)
find_package(geographiclib)
Expand Down
2 changes: 1 addition & 1 deletion src/cli/MeasureManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
#if __APPLE__
# include "../../dependencies/cpprestsdk_char_traits_workaround.hpp"
# include <cpprestsdk_char_traits_workaround.hpp> // OpenStudio/dependencies/cpprestsdk_char_traits_workaround.hpp
#endif
#define _TURN_OFF_PLATFORM_STRING // cpprestsdk has an ugly macro U() that makes fmt break...
#include <cpprest/http_listener.h>
Expand Down
2 changes: 1 addition & 1 deletion src/utilities/bcl/RemoteBCL.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
#endif
#if __APPLE__
# include "../../../dependencies/cpprestsdk_char_traits_workaround.hpp"
# include <cpprestsdk_char_traits_workaround.hpp> // OpenStudio/dependencies/cpprestsdk_char_traits_workaround.hpp
#endif
// Macro U from cpprestsdk is clashing with (cf boost https://github.com/microsoft/cpprestsdk/issues/1214)
#define _TURN_OFF_PLATFORM_STRING
Expand Down