- use C++11 STL features instead of custom code
[packages/dcmtk.git] / dcmtk-3.6.1-0002-Find-and-include-CharLS.patch
CommitLineData
291a797f
AM
1From 9cc2c06d89d357a22065913abb0ab3ccda5a732b Mon Sep 17 00:00:00 2001
2From: Mario Ceresa <mario.ceresa@upf.edu>
3Date: Mon, 15 Dec 2014 12:22:00 +0100
4Subject: [PATCH] Find and include CharLS
5
6---
7 CMake/3rdparty.cmake | 14 ++++++++++++++
8 1 file changed, 14 insertions(+)
9
10diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
11index 9fcca77..2ccda35 100755
12--- a/CMake/3rdparty.cmake
13+++ b/CMake/3rdparty.cmake
14@@ -267,6 +267,20 @@ ELSE(WIN32)
15 ENDIF(NOT WRAP_FOUND)
16 ENDIF(DCMTK_WITH_WRAP)
17
18+ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
19+
20+ IF(DCMTK_WITH_CHARLS)
21+ FIND_PACKAGE(CharLS)
22+ INCLUDE_DIRECTORIES(${CHARLS_INCLUDE_DIRS})
23+ SET(CHARLS_LIBS ${CHARLS_LIBRARIES})
24+ IF (NOT CHARLS_LIBS)
25+ MESSAGE(STATUS "Warning: CharLS not found. Cannot build!")
26+ ELSE(NOT CHARLS_LIBS)
27+ MESSAGE(STATUS "Info: DCMTK CHARLS support will be enabled")
28+ SET(WITH_CHARLS 1)
29+ ENDIF(NOT CHARLS_LIBS)
30+ ENDIF(DCMTK_WITH_CHARLS)
31+
32 ENDIF()
33
34 # Find doxygen
35--
361.9.3
37
This page took 0.066757 seconds and 4 git commands to generate.