To avoid pushing out twice the meta elements, wile trying to write 'ACR-NEMA-

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29b710f9e4d32eff8cb8e79e554a5dd3f61144be..40e84c549050dcc5ccf15144a8a79780413b07a3 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,13 +3,27 @@
 INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
 # Build jpeg lib first:
-SUBDIRS(gdcmjpeg)
+IF (WIN32)
+  IF (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DJPEGDLL)
+  ELSE (BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DJPEGSTATIC)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+SUBDIRS(
+  gdcmjpeg
+  #gdcmmpeg2
+  #gdcmjasper
+  )
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src
+  ${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
 )
 
 SET(libgdcm_la_SOURCES
@@ -27,6 +41,7 @@ SET(libgdcm_la_SOURCES
    gdcmDicomDirStudy.cxx
    gdcmDict.cxx
    gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
@@ -43,13 +58,14 @@ SET(libgdcm_la_SOURCES
    gdcmJpeg8.cxx
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
-   gdcmJpeg2000.cxx
+   #   gdcmJpeg2000.cxx
+   #   gdcmMpeg.cxx
    gdcmPixelReadConvert.cxx
    gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
-   gdcmSerieHeader.cxx
+   gdcmSerieHelper.cxx
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
@@ -63,10 +79,12 @@ TARGET_LINK_LIBRARIES(gdcm
   gdcmjpeg8 
   gdcmjpeg12
   gdcmjpeg16
+  #  gdcmmpeg2
+  #  gdcmjasper
 )
 IF(WIN32)
   IF(NOT BORLAND)
-    TARGET_LINK_LIBRARIES(gdcm Wsock32 Snmpapi)
+    TARGET_LINK_LIBRARIES(gdcm wsock32 snmpapi)
   ENDIF(NOT BORLAND)
 ENDIF(WIN32)
 
@@ -76,5 +94,5 @@ IF(CMAKE_SYSTEM MATCHES "SunOS.*")
   TARGET_LINK_LIBRARIES(gdcm socket nsl)
 ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
 
-INSTALL_FILES(/include "\\.h$")
-INSTALL_TARGETS(/lib/ gdcm)
+INSTALL_FILES(/include/gdcm "\\.h$")
+INSTALL_TARGETS(/lib/gdcm/ gdcm)