]>
Commit | Line | Data |
---|---|---|
291a797f AM |
1 | From 9cc2c06d89d357a22065913abb0ab3ccda5a732b Mon Sep 17 00:00:00 2001 |
2 | From: Mario Ceresa <mario.ceresa@upf.edu> | |
3 | Date: Mon, 15 Dec 2014 12:22:00 +0100 | |
4 | Subject: [PATCH] Find and include CharLS | |
5 | ||
6 | --- | |
7 | CMake/3rdparty.cmake | 14 ++++++++++++++ | |
8 | 1 file changed, 14 insertions(+) | |
9 | ||
10 | diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake | |
11 | index 9fcca77..2ccda35 100755 | |
12 | --- a/CMake/3rdparty.cmake | |
13 | +++ b/CMake/3rdparty.cmake | |
ce2d2a2f JB |
14 | @@ -357,6 +357,20 @@ |
15 | endif() | |
16 | endif() | |
291a797f | 17 | |
ce2d2a2f | 18 | + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake) |
291a797f | 19 | + |
ce2d2a2f JB |
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) | |
291a797f | 31 | + |
ce2d2a2f | 32 | endif(WIN32 AND NOT MINGW) |
291a797f | 33 | |
ce2d2a2f | 34 | if(NOT DEFINED DCMTK_WITH_STDLIBC_ICONV) |