Mercurial > hg > orthanc-webviewer
comparison CMakeLists.txt @ 229:967ae255a58f
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 11 May 2020 11:52:46 +0200 |
parents | aee499712ac4 |
children | cce89307af28 |
comparison
equal
deleted
inserted
replaced
228:0f9d183f685d | 229:967ae255a58f |
---|---|
25 | 25 |
26 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline") | 26 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline") |
27 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") | 27 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") |
28 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") | 28 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") |
29 else() | 29 else() |
30 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.5.5") | 30 set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.1") |
31 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") | 31 set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") |
32 endif() | 32 endif() |
33 | 33 |
34 | 34 |
35 # Parameters of the build | 35 # Parameters of the build |
89 ) | 89 ) |
90 endif() | 90 endif() |
91 | 91 |
92 add_definitions( | 92 add_definitions( |
93 -DORTHANC_ENABLE_LOGGING_PLUGIN=1 | 93 -DORTHANC_ENABLE_LOGGING_PLUGIN=1 |
94 -DHAS_ORTHANC_EXCEPTION=1 | |
94 ) | 95 ) |
95 | 96 |
96 EmbedResources( | 97 EmbedResources( |
97 ORTHANC_EXPLORER ${CMAKE_SOURCE_DIR}/Resources/OrthancExplorer.js | 98 ORTHANC_EXPLORER ${CMAKE_SOURCE_DIR}/Resources/OrthancExplorer.js |
98 JAVASCRIPT_LIBS ${JAVASCRIPT_LIBS_DIR} | 99 JAVASCRIPT_LIBS ${JAVASCRIPT_LIBS_DIR} |