diff --git a/CMakeLists.txt b/CMakeLists.txt index 003951754..b4c428353 100644 --- 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) @@ -102,6 +101,7 @@ set(SEAL_TARGETS_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/cmake/SEALTargets.cmake) 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) +set(SEAL_THIRDPARTY_DIR ${CMAKE_CURRENT_BINARY_DIR}/thirdparty) # Install set(SEAL_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/SEAL-${SEAL_VERSION_MAJOR}.${SEAL_VERSION_MINOR}) @@ -719,15 +719,15 @@ endif() # Create SEALNet.csproj, SEALNetExamples.csproj, and SEALNetTest.csproj configure_file( ${CMAKE_CURRENT_LIST_DIR}/dotnet/src/SEALNet.csproj.in - ${CMAKE_CURRENT_LIST_DIR}/dotnet/src/SEALNet.csproj + ${CMAKE_CURRENT_BINARY_DIR}/dotnet/src/SEALNet.csproj @ONLY) configure_file( ${CMAKE_CURRENT_LIST_DIR}/dotnet/tests/SEALNetTest.csproj.in - ${CMAKE_CURRENT_LIST_DIR}/dotnet/tests/SEALNetTest.csproj + ${CMAKE_CURRENT_BINARY_DIR}/dotnet/tests/SEALNetTest.csproj @ONLY) configure_file( ${CMAKE_CURRENT_LIST_DIR}/dotnet/examples/SEALNetExamples.csproj.in - ${CMAKE_CURRENT_LIST_DIR}/dotnet/examples/SEALNetExamples.csproj + ${CMAKE_CURRENT_BINARY_DIR}/dotnet/examples/SEALNetExamples.csproj @ONLY) # Set the sealc dynamic library file names to be included in creating @@ -738,7 +738,7 @@ configure_file( # Create SEALNet-multi.nuspec for a multi-platform NuGet package configure_file( ${CMAKE_CURRENT_LIST_DIR}/dotnet/nuget/SEALNet-multi.nuspec.in - ${CMAKE_CURRENT_LIST_DIR}/dotnet/nuget/SEALNet-multi.nuspec + ${CMAKE_CURRENT_BINARY_DIR}/dotnet/nuget/SEALNet-multi.nuspec @ONLY) set(NUGET_WINDOWS_SEAL_C_PATH "") @@ -757,5 +757,5 @@ endif() # Create SEALNet.nuspec for a local NuGet pack from SEALNet.nuspec.in configure_file( ${CMAKE_CURRENT_LIST_DIR}/dotnet/nuget/SEALNet.nuspec.in - ${CMAKE_CURRENT_LIST_DIR}/dotnet/nuget/SEALNet.nuspec + ${CMAKE_CURRENT_BINARY_DIR}/dotnet/nuget/SEALNet.nuspec @ONLY) diff --git a/cmake/ExternalIntelHEXL.cmake b/cmake/ExternalIntelHEXL.cmake index 3b694f91e..c1b8b420b 100644 --- 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 index 757997c03..0c5520f4d 100644 --- 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 index 67bba833c..dd382ebdb 100644 --- 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 index 7868dce05..5af0f8a8f 100644 --- 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() diff --git a/dotnet/examples/SEALNetExamples.csproj.in b/dotnet/examples/SEALNetExamples.csproj.in index e1b595c78..0573bad13 100644 --- a/dotnet/examples/SEALNetExamples.csproj.in +++ b/dotnet/examples/SEALNetExamples.csproj.in @@ -20,7 +20,7 @@ - + @@ -28,4 +28,7 @@ + + + diff --git a/dotnet/src/SEALNet.csproj.in b/dotnet/src/SEALNet.csproj.in index 1a71dde6b..735e83868 100644 --- a/dotnet/src/SEALNet.csproj.in +++ b/dotnet/src/SEALNet.csproj.in @@ -27,4 +27,8 @@ $(DefineConstants);DEBUG;TRACE + + + + diff --git a/dotnet/tests/SEALNetTest.csproj.in b/dotnet/tests/SEALNetTest.csproj.in index 57b928a8f..73ed9345b 100644 --- a/dotnet/tests/SEALNetTest.csproj.in +++ b/dotnet/tests/SEALNetTest.csproj.in @@ -26,7 +26,7 @@ - + @@ -34,4 +34,7 @@ + + +