Merge branch '3.6.x' of ssh.dev.azure.com:v3/msrcrypto/SEAL/SEAL into…

… 3.6.x
microsoft · Feb 12, 2021 · 6078012 · 6078012
2 parents 269fd3c + 67669e8
commit 6078012
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Version 3.6.2
 
+- Fixed an issue [(Issue 278)](https://github.com/microsoft/SEAL/issues/278) in finding ZLIB header files when building SEAL with `BUILD_SHARED_LIBS=ON`.
 - Fixed a member variable initialization order bug in [SafeByteBuffer](native/src/seal/util/streambuf.h).
 - Added benchmarks that depends on Google Benchmark in [native/bench](native/bench).
 - Changed low-level code that reduces the runtime difference among code generated by msvc, gcc, and clang.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -390,6 +390,8 @@ else()
 
     if(SEAL_USE_ZLIB)
         target_link_libraries(seal_shared PRIVATE ${zlib})
+        target_include_directories(seal_shared PRIVATE $<BUILD_INTERFACE:${zlib_SOURCE_DIR}>)
+        target_include_directories(seal_shared PRIVATE $<BUILD_INTERFACE:$<TARGET_PROPERTY:${zlib},BINARY_DIR>>)
     endif()
 
     if(SEAL_USE_ZSTD)

diff --git a/native/bench/bench.cpp b/native/bench/bench.cpp
@@ -14,6 +14,8 @@ namespace sealbench
 {
     /**
     Wraps benchmark::RegisterBenchmark to use microsecond and accepts std::string name.
+    Each benchmark runs for 10 rather than a dynamically chosen amount of iterations.
+    If more runs are needed for more accurate measurements, either remove line 26, or run benchmarks in repetition.
     */
 #define SEAL_BENCHMARK_REGISTER(category, n, log_q, name, func, ...)                                                  \
     RegisterBenchmark(                                                                                                \