X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=2fcf1d4b44740910ed1df259e76b8d677eedabcd;hb=3a7de562dd07854a96a0a148e1c95652baefe2c8;hp=0ae9be8e7e4990b57d1fbc79f7ae1ce6c7c90e7a;hpb=4b91dba73a6b98d92e372f65be46cdf574ce7cfa;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ae9be8e..2fcf1d4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,10 @@
+#-----------------------------------------------------------------------------
+# Build jpeg lib first:
 SUBDIRS(jpeg)
 
-#CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \
-#           -D__STDC_LIMIT_MACROS  # Refer to stdint.h
-
+INCLUDE_DIRECTORIES(
+  ${GDCM_SOURCE_DIR}/jpeg/
+)
 
 SET(libgdcm_la_SOURCES
 	gdcmException.cxx
@@ -25,48 +27,20 @@ SET(libgdcm_la_SOURCES
 	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  -D__STDC_LIMIT_MACROS
-#  COMPILE_FLAGS  -DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\"
-#)
+#-----------------------------------------------------------------------------
+# 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
 
 SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}
   PROPERTIES
-  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
+  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
 )
 
-
-
-#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(UNIX)
@@ -80,4 +54,12 @@ ELSE(UNIX)
     gdcmijpeg12
     Wsock32.lib   #doesn't exist on cygwin
   )
-ENDIF(UNIX)
\ No newline at end of file
+ENDIF(UNIX)
+
+#The following is not wroking 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)
\ No newline at end of file