X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=8ab9f5443c7441ba3dae61c63635f356491e38c8;hb=b08873f37c7696af28217a92f2ee41bf76e98a63;hp=51109483437adbe271f0bb57b407707c2a92b685;hpb=6a7c2fbcb5bfc240a3b9875ad4836f5dc058e069;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51109483..8ab9f544 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,8 +5,8 @@ INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 SUBDIRS(
   gdcmjpeg
   #gdcmmpeg2
-  gdcmjasper
   gdcmjpegls
+  gdcmopenjpeg
   )
 
 # "jpeglib.h" is defined here:
@@ -15,8 +15,7 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/gdcmmpeg2/src/mpeg2dec
   ${GDCM_BINARY_DIR} #for gdcmConfigure.h
   ${GDCM_BINARY_DIR}/src #for gdcmjpeg 8, 12 and 16 
-  ${GDCM_BINARY_DIR}/src/gdcmjasper/src/libjasper/include
-  ${GDCM_SOURCE_DIR}/src/gdcmjasper/src/libjasper/include
+  ${GDCM_SOURCE_DIR}/src/gdcmopenjpeg/libopenjpeg
 )
 
 SET(libgdcm_la_SOURCES
@@ -77,7 +76,7 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg12
   gdcmjpeg16
   #  gdcmmpeg2
-  gdcmjasper
+  gdcmopenjpeg
 )
 IF(WIN32)
   IF(NOT BORLAND)