Skip to content

Commit c0a1dd7

Browse files
authored
Merge pull request #5436 from NREL/5435_cpprestsdk_workaround_install
Fix #5435 - copy cpprestsdk_char_traits_workaround to build_dir/src so it's automatically included
2 parents 89d393d + c329fc5 commit c0a1dd7

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,9 @@ find_package(jsoncpp)
441441
find_package(fmt)
442442
find_package(SQLite3)
443443
find_package(cpprestsdk)
444+
# TODO: this is a workaround for #5398, it should not be there for ever
445+
configure_file("${PROJECT_SOURCE_DIR}/dependencies/cpprestsdk_char_traits_workaround.hpp" "${PROJECT_BINARY_DIR}/src/cpprestsdk_char_traits_workaround.hpp" COPYONLY)
446+
444447
find_package(websocketpp)
445448
find_package(Boost)
446449
find_package(geographiclib)

src/cli/MeasureManager.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
2323
#endif
2424
#if __APPLE__
25-
# include "../../dependencies/cpprestsdk_char_traits_workaround.hpp"
25+
# include <cpprestsdk_char_traits_workaround.hpp> // OpenStudio/dependencies/cpprestsdk_char_traits_workaround.hpp
2626
#endif
2727
#define _TURN_OFF_PLATFORM_STRING // cpprestsdk has an ugly macro U() that makes fmt break...
2828
#include <cpprest/http_listener.h>

src/utilities/bcl/RemoteBCL.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
1616
#endif
1717
#if __APPLE__
18-
# include "../../../dependencies/cpprestsdk_char_traits_workaround.hpp"
18+
# include <cpprestsdk_char_traits_workaround.hpp> // OpenStudio/dependencies/cpprestsdk_char_traits_workaround.hpp
1919
#endif
2020
// Macro U from cpprestsdk is clashing with (cf boost https://github.com/microsoft/cpprestsdk/issues/1214)
2121
#define _TURN_OFF_PLATFORM_STRING

0 commit comments

Comments
 (0)