Mercurial > hg > orthanc
changeset 2399:971eb08553a9
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 31 Aug 2017 16:47:57 +0200 |
| parents | 7f9a78f7b5a7 (diff) 98c2a9c2c0fc (current diff) |
| children | f235cc740c4b |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Aug 30 17:18:16 2017 +0200 +++ b/CMakeLists.txt Thu Aug 31 16:47:57 2017 +0200 @@ -25,7 +25,8 @@ ##################################################################### -## CMake parameters tunable at the command line +## CMake parameters tunable at the command line to configure the +## plugins, the companion tools, and the unit tests ##################################################################### # Parameters of the build @@ -33,7 +34,6 @@ SET(BUILD_RECOVER_COMPRESSED_FILE ON CACHE BOOL "Whether to build the companion tool to recover files compressed using Orthanc") SET(BUILD_SERVE_FOLDERS ON CACHE BOOL "Whether to build the ServeFolders plugin") SET(ENABLE_PLUGINS ON CACHE BOOL "Enable plugins") -SET(STANDALONE_BUILD ON CACHE BOOL "Standalone build (all the resources are embedded, necessary for releases)") SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests") # Advanced parameters to fine-tune linking against system libraries
--- a/Resources/CMake/OrthancFrameworkParameters.cmake Wed Aug 30 17:18:16 2017 +0200 +++ b/Resources/CMake/OrthancFrameworkParameters.cmake Thu Aug 31 16:47:57 2017 +0200 @@ -22,6 +22,7 @@ # Support of static compilation set(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages") 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)") # Generic parameters of the build set(ENABLE_CIVETWEB OFF CACHE BOOL "Use Civetweb instead of Mongoose (experimental)")