File: cmake

package info (click to toggle)
orthanc-webviewer 2.10%2Bdfsg-2
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 1,956 kB
  • sloc: javascript: 21,840; cpp: 7,300; python: 345; sh: 93; makefile: 60
file content (26 lines) | stat: -rw-r--r-- 857 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
Description: Fix the inclusion of the JavaScript libraries
Author: Sebastien Jodogne <s.jodogne@orthanc-labs.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: OrthancWebViewer-2.10/CMakeLists.txt
===================================================================
--- OrthancWebViewer-2.10.orig/CMakeLists.txt
+++ OrthancWebViewer-2.10/CMakeLists.txt
@@ -19,7 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8...4.0)
 
 project(OrthancWebViewer)
 
@@ -85,7 +85,7 @@ else()
 endif()
 
 
-include(${CMAKE_SOURCE_DIR}/Resources/CMake/JavaScriptLibraries.cmake)
+set(JAVASCRIPT_LIBS_DIR ${CMAKE_CURRENT_BINARY_DIR}/javascript-libs/)
 include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake)