comparison ViewerPlugin/CMakeLists.txt @ 13:e944d00a8a9e

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 27 Oct 2016 10:01:10 +0200
parents 2d7676b93a0f
children 7a88c614be04
comparison
equal deleted inserted replaced
12:2d7676b93a0f 13:e944d00a8a9e
18 SET(USE_SYSTEM_OPENJPEG ON CACHE BOOL "Use the system version of OpenJpeg") 18 SET(USE_SYSTEM_OPENJPEG ON CACHE BOOL "Use the system version of OpenJpeg")
19 SET(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of ZLib") 19 SET(USE_SYSTEM_ZLIB ON CACHE BOOL "Use the system version of ZLib")
20 SET(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK") 20 SET(USE_SYSTEM_ORTHANC_SDK ON CACHE BOOL "Use the system version of the Orthanc plugin SDK")
21 21
22 # Parameters related to OpenLayers 22 # Parameters related to OpenLayers
23 SET(USE_SYSTEM_OPENLAYERS ON CACHE BOOL "Use the system version of OpenLayers") 23 SET(USE_SYSTEM_OPENLAYERS OFF CACHE BOOL "Use the system version of OpenLayers")
24 SET(OPENLAYERS_CSS "" CACHE FILEPATH "Path to the system version of OpenLayers CSS") 24 SET(OPENLAYERS_CSS "" CACHE FILEPATH "Path to the system version of OpenLayers CSS")
25 SET(OPENLAYERS_JS "" CACHE FILEPATH "Path to the system version of OpenLayers JavaScript") 25 SET(OPENLAYERS_JS "" CACHE FILEPATH "Path to the system version of OpenLayers JavaScript")
26 26
27 27
28 ##################################################################### 28 #####################################################################
37 include(CheckIncludeFiles) 37 include(CheckIncludeFiles)
38 include(CheckIncludeFileCXX) 38 include(CheckIncludeFileCXX)
39 include(CheckLibraryExists) 39 include(CheckLibraryExists)
40 include(FindPythonInterp) 40 include(FindPythonInterp)
41 include(FindPkgConfig) 41 include(FindPkgConfig)
42 include(CheckSymbolExists)
42 43
43 include(${ORTHANC_ROOT}/Resources/CMake/Compiler.cmake) 44 include(${ORTHANC_ROOT}/Resources/CMake/Compiler.cmake)
44 include(${ORTHANC_ROOT}/Resources/CMake/AutoGeneratedCode.cmake) 45 include(${ORTHANC_ROOT}/Resources/CMake/AutoGeneratedCode.cmake)
45 include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake) 46 include(${ORTHANC_ROOT}/Resources/CMake/DownloadPackage.cmake)
46 47
126 OPENLAYERS_CSS ${CMAKE_CURRENT_BINARY_DIR}/v3.19.0-dist/ol.css 127 OPENLAYERS_CSS ${CMAKE_CURRENT_BINARY_DIR}/v3.19.0-dist/ol.css
127 OPENLAYERS_JS ${CMAKE_CURRENT_BINARY_DIR}/v3.19.0-dist/ol.js 128 OPENLAYERS_JS ${CMAKE_CURRENT_BINARY_DIR}/v3.19.0-dist/ol.js
128 ) 129 )
129 130
130 else() 131 else()
132 if (OPENLAYERS_CSS STREQUAL "")
133 message(FATAL_ERROR "The option OPENLAYERS_CSS is not set")
134 endif()
135
136 if (OPENLAYERS_JS STREQUAL "")
137 message(FATAL_ERROR "The option OPENLAYERS_JS is not set")
138 endif()
139
131 set(OPENLAYERS_RESOURCES 140 set(OPENLAYERS_RESOURCES
132 OPENLAYERS_CSS ${OPENLAYERS_CSS} 141 OPENLAYERS_CSS ${OPENLAYERS_CSS}
133 OPENLAYERS_JS ${OPENLAYERS_JS} 142 OPENLAYERS_JS ${OPENLAYERS_JS}
134 ) 143 )
135 endif() 144 endif()