Add SEAL_PURE_SOURCETREE option

jdrean · Mar 15, 2022 · 863467a · 863467a
1 parent 88bbc51
commit 863467a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,7 +90,6 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # Source Tree
 set(SEAL_INCLUDES_DIR ${CMAKE_CURRENT_LIST_DIR}/native/src)
-set(SEAL_THIRDPARTY_DIR ${CMAKE_CURRENT_LIST_DIR}/thirdparty)
 set(SEAL_CONFIG_IN_FILENAME ${CMAKE_CURRENT_LIST_DIR}/cmake/SEALConfig.cmake.in)
 set(SEAL_CONFIG_H_IN_FILENAME ${SEAL_INCLUDES_DIR}/seal/util/config.h.in)
 
@@ -103,6 +102,19 @@ set(SEAL_CONFIG_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/cmake/SEALConfig.cmake)
 set(SEAL_CONFIG_VERSION_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/cmake/SEALConfigVersion.cmake)
 set(SEAL_CONFIG_H_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/native/src/seal/util/config.h)
 
+# [option] SEAL_PURE_SOURCETREE (default: OFF)
+set(SEAL_PURE_SOURCETREE_OPTION_STR "When set, the SEAL build will not write any files outside the build directory, including thirdparty dependencies sources.")
+option(SEAL_PURE_SOURCETREE ${SEAL_PURE_SOURCETREE_OPTION_STR} OFF)
+message(STATUS "SEAL_PURE_SOURCETREE: ${SEAL_PURE_SOURCETREE}")
+
+# Build or source tree depending on configuration
+if(${SEAL_PURE_SOURCETREE} )
+    set(SEAL_THIRDPARTY_DIR ${CMAKE_CURRENT_BINARY_DIR}/thirdparty)
+else()
+    set(SEAL_THIRDPARTY_DIR ${CMAKE_CURRENT_LIST_DIR}/thirdparty)
+endif()
+
+
 # Install
 set(SEAL_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/SEAL-${SEAL_VERSION_MAJOR}.${SEAL_VERSION_MINOR})
 set(SEAL_INCLUDES_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/SEAL-${SEAL_VERSION_MAJOR}.${SEAL_VERSION_MINOR})

diff --git a/README.md b/README.md
@@ -411,6 +411,9 @@ The following options can be used with CMake to configure the build. The default
 | SEAL_USE_CXX17         | **ON** / OFF                                                 | Set to `ON` to build Microsoft SEAL as C++17 for a positive performance impact.                                                                                                                        |
 | SEAL_USE_INTRIN        | **ON** / OFF                                                 | Set to `ON` to use compiler intrinsics for improved performance. CMake will automatically detect which intrinsics are available and enable them accordingly.                                           |
 
+| SEAL_PURE_SOURCETREE   | ON / **OFF**
+| When enabled, the SEAL build will only emit files into the cmake build directory. This includes third-party dependencies (both sources and binaries). This flag can improve compatibility with other build systems and enables concurrently building multiple instances of the SEAL library with different `cmake -B` options.
+
 As usual, these options can be passed to CMake with the `-D` flag.
 For example, one could run
 

diff --git a/cmake/ExternalIntelHEXL.cmake b/cmake/ExternalIntelHEXL.cmake
@@ -27,6 +27,7 @@ if(NOT hexl_POPULATED)
 
     add_subdirectory(
         ${hexl_SOURCE_DIR}
+        ${hexl_SOURCE_DIR}/../hexl-build
         EXCLUDE_FROM_ALL
     )
 endif()
diff --git a/cmake/ExternalMSGSL.cmake b/cmake/ExternalMSGSL.cmake
@@ -20,5 +20,6 @@ if(NOT msgsl_POPULATED)
 
     add_subdirectory(
         ${msgsl_SOURCE_DIR}
+        ${msgsl_SOURCE_DIR}/../msgsl-build
         EXCLUDE_FROM_ALL)
 endif()
diff --git a/cmake/ExternalZLIB.cmake b/cmake/ExternalZLIB.cmake
@@ -30,5 +30,6 @@ if(NOT zlib_POPULATED)
     set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS TRUE CACHE INTERNAL "Suppress CMP0048 warning" FORCE)
     add_subdirectory(
         ${zlib_SOURCE_DIR}
+        ${zlib_SOURCE_DIR}/../zlib-build
         EXCLUDE_FROM_ALL)
 endif()
diff --git a/cmake/ExternalZSTD.cmake b/cmake/ExternalZSTD.cmake
@@ -28,5 +28,6 @@ if(NOT zstd_POPULATED)
 
     add_subdirectory(
         ${zstd_SOURCE_DIR}/build/cmake
+        ${zstd_SOURCE_DIR}/../zstd-build
         EXCLUDE_FROM_ALL)
 endif()