aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--third_party/CMakeLists.txt10
2 files changed, 10 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6882a696..723cf364 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,6 +55,9 @@ endif()
find_package(OpenSSL REQUIRED)
+# mimalloc
+find_package(mimalloc REQUIRED)
+
# Set Build Information
configure_file(${CMAKE_SOURCE_DIR}/src/GpgFrontend.h.in ${CMAKE_SOURCE_DIR}/src/GpgFrontend.h @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/src/GpgFrontendBuildInfo.h.in ${CMAKE_SOURCE_DIR}/src/GpgFrontendBuildInfo.h @ONLY)
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index f6658eb1..876cf46d 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -26,7 +26,8 @@
# json
set(JSON_BuildTests OFF CACHE INTERNAL "")
-if(MINGW)
+# full sdk build on windows will use system installed libarchive
+if(MINGW AND NOT STABLE_BUILD_FULL_SDK)
add_subdirectory(libarchive EXCLUDE_FROM_ALL)
endif()
@@ -53,5 +54,8 @@ if(NOT APPLE)
add_subdirectory(mimalloc EXCLUDE_FROM_ALL)
endif()
-set(INSTALL_GTEST OFF)
-add_subdirectory(googletest EXCLUDE_FROM_ALL) \ No newline at end of file
+# full sdk build on windows will use system installed gtest
+if(NOT STABLE_BUILD_FULL_SDK AND NOT MINGW)
+ set(INSTALL_GTEST OFF)
+ add_subdirectory(googletest EXCLUDE_FROM_ALL)
+endif() \ No newline at end of file