--- a/OrthancFramework/SharedLibrary/CMakeLists.txt	Tue Jun 30 15:53:17 2020 +0200
+++ b/OrthancFramework/SharedLibrary/CMakeLists.txt	Tue Jun 30 17:00:18 2020 +0200
@@ -38,6 +38,12 @@
 
 include(${CMAKE_SOURCE_DIR}/../Resources/CMake/OrthancFrameworkParameters.cmake)
 
+if (STATIC_BUILD OR NOT USE_SYSTEM_DCMTK)
+  set(STANDALONE_BUILD ON)
+else()
+  set(STANDALONE_BUILD OFF)
+endif()
+
 set(ENABLE_DCMTK ON)
 set(ENABLE_DCMTK_TRANSCODING ON)
 set(ENABLE_GOOGLE_TEST ON)
@@ -464,14 +470,18 @@
   externalproject_add(UnitTests
     SOURCE_DIR "${CMAKE_SOURCE_DIR}/../UnitTestsSources"
     CMAKE_ARGS
-    -DALLOW_DOWNLOADS:BOOL=ON
     -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
     -DORTHANC_FRAMEWORK_LIBDIR:PATH=${CMAKE_CURRENT_BINARY_DIR}
     -DORTHANC_FRAMEWORK_ROOT:PATH=${CMAKE_CURRENT_BINARY_DIR}/Include/orthanc-framework
     -DORTHANC_FRAMEWORK_SOURCE:STRING=system
     -DORTHANC_FRAMEWORK_STATIC:BOOL=${STATIC_BUILD}
+
+    -DALLOW_DOWNLOADS:BOOL=${ALLOW_DOWNLOADS}
+    -DSTATIC_BUILD:BOOL=${STATIC_BUILD}
     -DUNIT_TESTS_WITH_HTTP_CONNEXIONS:BOOL=${UNIT_TESTS_WITH_HTTP_CONNEXIONS}
-    -DUSE_SYSTEM_GOOGLE_TEST:BOOL=OFF
+    -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=${USE_GOOGLE_TEST_DEBIAN_PACKAGE}
+    -DUSE_SYSTEM_GOOGLE_TEST:BOOL=${USE_SYSTEM_GOOGLE_TEST}
+    -DUSE_SYSTEM_JSONCPP:BOOL=${USE_SYSTEM_JSONCPP}
     ${Flags}
     )