From 081650a2e536c1a6a79cedadd3e0f10bf166d8ab Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 17 May 2021 23:00:23 +0100 Subject: [PATCH] Integrate Base64 library with build --- CMakeLists.txt | 1 + components/CMakeLists.txt | 2 ++ components/settings/parser.cpp | 2 ++ extern/Base64/CMakeLists.txt | 2 ++ 4 files changed, 7 insertions(+) create mode 100644 extern/Base64/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b97657ffd0..2ed4eafd7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -516,6 +516,7 @@ endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clan add_subdirectory (extern/osg-ffmpeg-videoplayer) add_subdirectory (extern/oics) +add_subdirectory (extern/Base64) if (BUILD_OPENCS) add_subdirectory (extern/osgQt) endif() diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 9041ee5333..06ae0791d7 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -251,6 +251,8 @@ target_link_libraries(components RecastNavigation::DebugUtils RecastNavigation::Detour RecastNavigation::Recast + + Base64 ) target_link_libraries(components ${BULLET_LIBRARIES}) diff --git a/components/settings/parser.cpp b/components/settings/parser.cpp index ee14eb5de7..f375bf85ba 100644 --- a/components/settings/parser.cpp +++ b/components/settings/parser.cpp @@ -7,6 +7,8 @@ #include +#include + void Settings::SettingsFileParser::loadSettingsFile(const std::string& file, CategorySettingValueMap& settings, bool base64Encoded) { mFile = file; diff --git a/extern/Base64/CMakeLists.txt b/extern/Base64/CMakeLists.txt new file mode 100644 index 0000000000..d1adf91bcb --- /dev/null +++ b/extern/Base64/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(Base64 INTERFACE) +target_include_directories(Base64 INTERFACE .) \ No newline at end of file