X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=b00eb68a9691f85ee2ce04b1a32ccd14dab82bda;hb=f215c25069021e599c885489388965b2c1b43f78;hp=d3980849d4a5f90fd8edd47ca5ef5ff9f786b422;hpb=ba355c8e668e9da685de102607f7001aa8504d7d;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3980849..b00eb68a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,9 +2,10 @@
 # Rebuild gdcm whenever a file starting with gdcm* is modified
 INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
+SET(OPJ_PREFIX gdcm)
 SUBDIRS(
   gdcmjpeg
-  gdcmmpeg2
+  #gdcmmpeg2
   #gdcmjpegls
   gdcmopenjpeg
   )
@@ -21,6 +22,9 @@ INCLUDE_DIRECTORIES(
 SET(libgdcm_la_SOURCES
    gdcmArgMgr.cxx
    gdcmBase.cxx
+   gdcmCallbackCommand.cxx
+   gdcmCommand.cxx
+   gdcmCommandManager.cxx
    gdcmDataEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
@@ -32,7 +36,6 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirVisit.cxx
    gdcmDicomDirSerie.cxx
    gdcmDicomDirStudy.cxx
-   gdcmDicomEntry.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
    gdcmDictGroupName.cxx
@@ -53,7 +56,7 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   gdcmMpeg.cxx
+   #gdcmMpeg.cxx
    gdcmOrientation.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
@@ -70,12 +73,20 @@ SET(libgdcm_la_SOURCES
    ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
    )
 
+# Since OpenJPEG does not used configured headers we have to 
+# do the -D alternative
+IF(NOT BUILD_SHARED_LIBS)
+ SET_SOURCE_FILES_PROPERTIES(
+   ${GDCM_SOURCE_DIR}/src/gdcmJpeg2000.cxx
+   COMPILE_FLAGS -DOPJ_STATIC)
+ENDIF(NOT BUILD_SHARED_LIBS)
+
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES})
 TARGET_LINK_LIBRARIES(gdcm 
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
-  gdcmmpeg2
+  #gdcmmpeg2
   gdcmopenjpeg
 )
 IF(WIN32)