changeset 1729:f62f5ee5a432

removing useless Version.cmake
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 02 Dec 2020 07:08:29 +0100
parents 51f10108c934
children af4a2d08549c
files OrthancStone/Resources/CMake/OrthancStoneParameters.cmake OrthancStone/Resources/CMake/Version.cmake
diffstat 2 files changed, 5 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancStone/Resources/CMake/OrthancStoneParameters.cmake	Tue Dec 01 20:38:55 2020 +0100
+++ b/OrthancStone/Resources/CMake/OrthancStoneParameters.cmake	Wed Dec 02 07:08:29 2020 +0100
@@ -25,7 +25,7 @@
 
 set(ORTHANC_STONE_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../Sources)
 
-include(${CMAKE_CURRENT_LIST_DIR}/Version.cmake)
+set(ORTHANC_STONE_VERSION "mainline")
 
 if (ORTHANC_STONE_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
@@ -35,6 +35,10 @@
   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")
--- a/OrthancStone/Resources/CMake/Version.cmake	Tue Dec 01 20:38:55 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# 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 Lesser 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program. If not, see
-# <http://www.gnu.org/licenses/>.
-
-
-set(ORTHANC_STONE_VERSION "mainline")
-
-add_definitions(
-  -DORTHANC_STONE_VERSION="${ORTHANC_STONE_VERSION}"
-  )