aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorjeffro256 <jeffro256@tutanota.com>2024-08-23 12:15:17 -0500
committerjeffro256 <jeffro256@tutanota.com>2024-09-10 16:07:36 -0500
commit65568d3a884857ce08d1170f5801a6891a5c187c (patch)
treee0685979542aed3ec92b2fe828be15b4ead7564f /CMakeLists.txt
parentb089f9ee69924882c5d14dd1a6991deb05d9d1cd (diff)
downloadmonzero-core-65568d3a884857ce08d1170f5801a6891a5c187c.tar.gz
monzero-core-65568d3a884857ce08d1170f5801a6891a5c187c.tar.xz
monzero-core-65568d3a884857ce08d1170f5801a6891a5c187c.zip
build: fix build with Boost 1.85 and remove instances of viewkey logging [RELEASE]
1. Use std::is_standard_layout and std::is_trivially_copyable instead of std::is_pod for KV byte-wise serialization, which fixes compile issue for Boost UUIDs 2. Removed reimplementation of std::hash for boost::uuids::uuid 3. Removed << operator overload for crypto::secret_key 4. Removed instances in code where private view key was dumped to the log in plaintext Release version of #9450, containing C++14 modified assertions
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fb03ba1f..7b77c3739 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1077,6 +1077,8 @@ if(STATIC)
endif()
find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale)
add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION)
+add_definitions(-DBOOST_NO_AUTO_PTR)
+add_definitions(-DBOOST_UUID_DISABLE_ALIGNMENT) # This restores UUID's std::has_unique_object_representations property
set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_LIB_SUFFIXES})
if(NOT Boost_FOUND)