]>
Commit | Line | Data |
---|---|---|
291a797f AM |
1 | From 356494231c72c30d4cfa17559891863c1c0c483b Mon Sep 17 00:00:00 2001 |
2 | From: Mario Ceresa <mario.ceresa@upf.edu> | |
3 | Date: Mon, 15 Dec 2014 14:26:11 +0100 | |
4 | Subject: [PATCH] Use cmake suggested location for CharLS | |
5 | ||
6 | --- | |
7 | dcmjpls/apps/CMakeLists.txt | 2 +- | |
8 | dcmjpls/libsrc/CMakeLists.txt | 2 +- | |
9 | 2 files changed, 2 insertions(+), 2 deletions(-) | |
10 | ||
966e73a5 JB |
11 | --- dcmtk-3.6.6/dcmjpls/apps/CMakeLists.txt.orig 2021-08-28 22:06:28.200993561 +0200 |
12 | +++ dcmtk-3.6.6/dcmjpls/apps/CMakeLists.txt 2021-08-29 12:52:13.793079185 +0200 | |
13 | @@ -8,5 +8,5 @@ endforeach() | |
291a797f AM |
14 | |
15 | # make sure executables are linked to the corresponding libraries | |
ce2d2a2f | 16 | foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm) |
966e73a5 | 17 | - DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls dcmtkcharls dcmimage dcmimgle dcmdata oflog ofstd ofstd) |
291a797f | 18 | + DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls ${CHARLS_LIBS} dcmimage dcmimgle dcmdata oflog ofstd ofstd) |
ce2d2a2f | 19 | endforeach() |
580352da JB |
20 | --- dcmtk-3.6.7/dcmjpls/libsrc/CMakeLists.txt.orig 2023-04-25 21:19:43.920918726 +0200 |
21 | +++ dcmtk-3.6.7/dcmjpls/libsrc/CMakeLists.txt 2023-04-25 21:20:49.623896115 +0200 | |
22 | @@ -12,4 +12,4 @@ DCMTK_ADD_LIBRARY(dcmjpls | |
23 | djcodece.cc | |
24 | ) | |
291a797f | 25 | |
966e73a5 | 26 | -DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage dcmtkcharls) |
291a797f | 27 | +DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage ${CHARLS_LIBS}) |