Mercurial > hg > orthanc-stone
changeset 1732:17684d0b02c3
back to mainline
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 02 Dec 2020 13:27:30 +0100 |
parents | af4a2d08549c (current diff) 816e1634f221 (diff) |
children | 940575fba346 |
files | Applications/StoneWebViewer/Version.cmake |
diffstat | 4 files changed, 33 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/StoneWebViewer/Plugin/CMakeLists.txt Wed Dec 02 12:47:05 2020 +0100 +++ b/Applications/StoneWebViewer/Plugin/CMakeLists.txt Wed Dec 02 13:27:30 2020 +0100 @@ -21,18 +21,7 @@ cmake_policy(SET CMP0058 NEW) project(StoneWebViewerPlugin) - -set(ORTHANC_PLUGIN_VERSION "mainline") - -if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline") - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") - set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") -else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.7.2") - set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") -endif() - - +include(${CMAKE_SOURCE_DIR}/../Version.cmake) set(ORTHANC_STONE_BINARIES "${CMAKE_SOURCE_DIR}/../../../wasm-binaries/StoneWebViewer/" CACHE PATH "Path to the binaries of the \"../WebAssembly\" folder") @@ -82,7 +71,7 @@ add_definitions( -DHAS_ORTHANC_EXCEPTION=1 - -DPLUGIN_VERSION="${ORTHANC_PLUGIN_VERSION}" + -DPLUGIN_VERSION="${STONE_WEB_VIEWER_VERSION}" -DPLUGIN_NAME="stone-webviewer" ) @@ -112,8 +101,8 @@ ) set_target_properties(StoneWebViewer PROPERTIES - VERSION ${ORTHANC_PLUGIN_VERSION} - SOVERSION ${ORTHANC_PLUGIN_VERSION}) + VERSION ${STONE_WEB_VIEWER_VERSION} + SOVERSION ${STONE_WEB_VIEWER_VERSION}) install( TARGETS StoneWebViewer
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Applications/StoneWebViewer/Version.cmake Wed Dec 02 13:27:30 2020 +0100 @@ -0,0 +1,28 @@ +# Stone of Orthanc +# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics +# Department, University Hospital of Liege, Belgium +# Copyright (C) 2017-2020 Osimis S.A., Belgium +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU Affero General Public License +# as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + + +set(STONE_WEB_VIEWER_VERSION "mainline") + +if (STONE_WEB_VIEWER_VERSION STREQUAL "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") +else() + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "82652c5fc04f") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") +endif()
--- a/Applications/StoneWebViewer/WebAssembly/CMakeLists.txt Wed Dec 02 12:47:05 2020 +0100 +++ b/Applications/StoneWebViewer/WebAssembly/CMakeLists.txt Wed Dec 02 13:27:30 2020 +0100 @@ -21,6 +21,7 @@ cmake_policy(SET CMP0058 NEW) project(OrthancStone) +include(${CMAKE_SOURCE_DIR}/../Version.cmake) set(ORTHANC_STONE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../../wasm-binaries/StoneWebViewer" CACHE PATH "Where to put the WebAssembly binaries")
--- a/OrthancStone/Resources/CMake/OrthancStoneParameters.cmake Wed Dec 02 12:47:05 2020 +0100 +++ b/OrthancStone/Resources/CMake/OrthancStoneParameters.cmake Wed Dec 02 13:27:30 2020 +0100 @@ -25,20 +25,6 @@ set(ORTHANC_STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../Sources) -set(ORTHANC_STONE_VERSION "mainline") - -if (ORTHANC_STONE_VERSION STREQUAL "mainline") - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") - set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") -else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "82652c5fc04f") - set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") -endif() - -add_definitions( - -DORTHANC_STONE_VERSION="${ORTHANC_STONE_VERSION}" - ) - # Parameters of the build set(STATIC_BUILD OFF CACHE BOOL "Static build of the third-party libraries (necessary for Windows)") set(ALLOW_DOWNLOADS OFF CACHE BOOL "Allow CMake to download packages")