X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=1ccabed4e0e8f5cafb2e7195e92627f64cd58857;hb=1aad11d86fa8d683d4f1a38b6f0483444e67f217;hp=79213f529a885adc038c5a8cc2d43bb6f5b3997b;hpb=2bb55608d296ddaa8b227d9a59148fc60f3fde47;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79213f52..1ccabed4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,76 +1,66 @@
+#-----------------------------------------------------------------------------
+# Build jpeg lib first:
 SUBDIRS(jpeg)
 
-#CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
-#           -D__STDC_LIMIT_MACROS  # Refer to stdint.h
-
-
-SET(libgdcm_la_SOURCES
-	gdcmException.cxx
-	gdcmUtil.cxx
-	gdcmHeader.cxx
-	gdcmHeaderHelper.cxx
-	gdcmElValue.cxx
-	gdcmDictEntry.cxx
-	gdcmDict.cxx
-	gdcmDictSet.cxx
-	gdcmElValSet.cxx
-	gdcmHeaderIdo.cxx
-	gdcmFile.cxx
-	gdcmVR.cxx
-	gdcmTS.cxx
-	gdcmJpeg.cxx
-	gdcmJpeg12.cxx
-	gdcmJpeg2000.cxx
-	gdcmRLE.cxx
-	gdcmParse.cxx
-	gdcmJpegIdo.cxx
+# "jpeglib.h" is defined here:
+INCLUDE_DIRECTORIES(
+  ${GDCM_SOURCE_DIR}/src/jpeg/libijg8
+  #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
+  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
+  ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
 )
-#Why one should not use ADD_DEFINITIONS
-#http://www.cmake.org/pipermail/cmake/2003-September/004286.html
-#ADD_DEFINITIONS(-DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}/\\")
-ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS)
 
-SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES} 
-  PROPERTIES 
-  COMPILE_FLAGS  -D__STDC_LIMIT_MACROS
-  COMPILE_FLAGS  -DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\"
+SET(libgdcm_la_SOURCES
+   gdcmDebug.cxx
+   gdcmDicomDir.cxx
+   gdcmDicomDirElement.cxx
+   gdcmDicomDirImage.cxx
+   gdcmDicomDirMeta.cxx
+   gdcmDicomDirPatient.cxx
+   gdcmDicomDirSerie.cxx
+   gdcmDicomDirStudy.cxx
+   gdcmDict.cxx
+   gdcmDictEntry.cxx
+   gdcmDictSet.cxx
+   gdcmDirList.cxx
+   gdcmException.cxx
+   gdcmFile.cxx
+   gdcmGlobal.cxx
+   gdcmHeader.cxx
+   gdcmHeaderEntry.cxx
+   gdcmHeaderHelper.cxx
+   gdcmJpeg12.cxx
+   gdcmJpeg2000.cxx
+   gdcmJpeg.cxx
+   gdcmObject.cxx
+   gdcmParsePixels.cxx
+   gdcmParser.cxx
+   gdcmRLE.cxx
+   gdcmTS.cxx
+   gdcmUtil.cxx
+   gdcmVR.cxx
 )
 
-
-#libgdcminclude_HEADERS =   \
-#	gdcmException.h	   \
-#	gdcmHeader.h	   \
-#	gdcmHeaderHelper.h \
-#	gdcmCommon.h       \
-#	gdcm.h             \
-#	gdcmDictSet.h      \
-#	gdcmDict.h         \
-#	gdcmDictEntry.h    \
-#	gdcmElValue.h      \
-#	gdcmElValSet.h     \
-#	gdcmVR.h           \
-#	gdcmTS.h           \
-#	gdcmFile.h
-
-#EXTRA_DIST =            \
-#	gdcmUtil.h      \
-#	gdcmIdo.h       \
-#	iddcmjpeg.h
-
-
-
-
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-#TODO this is not working out of the box (on the first time)
-IF(WIN32)
+IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
-    Wsock32.lib
+    gdcmljpeg     # JPEG lib from xmedcom 
   )
-ELSE(WIN32)
+ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
+    gdcmljpeg
+    Wsock32.lib   #doesn't exist on cygwin
   )
-ENDIF(WIN32)
\ No newline at end of file
+ENDIF(UNIX)
+
+#The following is not working because when a header file is not found it tries 
+#to find one in the binary dir
+#INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})
+#INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)
+INSTALL_FILES(/include "\\.h$")
+
+INSTALL_TARGETS(/lib/ gdcm)