# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1597159076 -7200
# Node ID 8f5e35cb37581ff54ed33394b5c22adcb250e588
# Parent  9246aeba874331783ced7b082feb853e164d97f6# Parent  e2fb9ea255fc2c4970e1601b5e6fa8c38bf17fd6
integration 1.1->mainline

diff -r 9246aeba8743 -r 8f5e35cb3758 CMakeLists.txt
--- a/CMakeLists.txt	Wed Aug 05 16:23:35 2020 +0200
+++ b/CMakeLists.txt	Tue Aug 11 17:17:56 2020 +0200
@@ -34,7 +34,6 @@
 
 # Parameters of the build
 set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)")
-set(STANDALONE_BUILD ON CACHE BOOL "Standalone build (all the resources are embedded, necessary for releases)")
 set(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages")
 set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc framework (can be \"hg\", \"archive\", \"web\" or \"path\")")
 set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_FRAMEWORK_DEFAULT_VERSION}" CACHE STRING "Version of the Orthanc framework")
diff -r 9246aeba8743 -r 8f5e35cb3758 Resources/BuildInstructions.txt
--- a/Resources/BuildInstructions.txt	Wed Aug 05 16:23:35 2020 +0200
+++ b/Resources/BuildInstructions.txt	Tue Aug 11 17:17:56 2020 +0200
@@ -16,7 +16,7 @@
 
 # mkdir Build
 # cd Build
-# cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON -DSTANDALONE_BUILD=ON -DUSE_SYSTEM_ORTHANC_SDK=OFF
+# cmake .. -DCMAKE_BUILD_TYPE=Debug -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON -DUSE_SYSTEM_ORTHANC_SDK=OFF
 # make