X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f8848c8c88a647f3dafa998e650d85bdd2b15e70;hb=d3710448e1a6c462d762a10b9f02ca051bf090e3;hp=09b2978219e99a415f4740d8fbcff9675a7ad927;hpb=7b90a94638699fec1143d1928f6a6b6f3c769d54;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09b29782..f8848c8c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,13 @@
+#-----------------------------------------------------------------------------
+# Build jpeg lib first:
 SUBDIRS(jpeg)
 
-#CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
-#           -D__STDC_LIMIT_MACROS  # Refer to stdint.h
-
+# "jpeglib.h" is defined here:
+INCLUDE_DIRECTORIES(
+  ${GDCM_SOURCE_DIR}/jpeg/libijg8
+  #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
+  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
+)
 
 SET(libgdcm_la_SOURCES
 	gdcmException.cxx
@@ -23,54 +28,43 @@ SET(libgdcm_la_SOURCES
 	gdcmJpeg2000.cxx
 	gdcmRLE.cxx
 	gdcmParse.cxx
-	gdcmJpegIdo.cxx
-)
-#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  -DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\"
-  COMPILE_FLAGS  -D__STDC_LIMIT_MACROS
 )
+#-----------------------------------------------------------------------------
+# Why one should not use ADD_DEFINITIONS
+# http://www.cmake.org/pipermail/cmake/2003-September/004286.html
 
+#-----------------------------------------------------------------------------
+# __STDC_LIMIT_MACROS -> Refer to stdint.h
+# http://www.cmake.org/pipermail/cmake/2003-October/004369.html
+# http://www.cmake.org/pipermail/cmake/2003-October/004373.html
 
-#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
-
-
-
+SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}
+  PROPERTIES
+  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
+)
 
 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
+    gdcmjpeg     # JPEG lib from xmedcom 
   )
-ELSE(WIN32)
+ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
+    gdcmjpeg
+    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)
+#INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
\ No newline at end of file