Mercurial > hg > orthanc-gdcm
changeset 40:8f5e35cb3758
integration 1.1->mainline
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 11 Aug 2020 17:17:56 +0200 |
| parents | 9246aeba8743 (current diff) e2fb9ea255fc (diff) |
| children | 22bbf7b7e58d |
| files | CMakeLists.txt |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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")
--- 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