* FIX: make install should be ok now on ùnix plateform

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4651a2e27c6649194a2b5688604b8f2a77d93367..a2afadc264a9890819548f1d7c570fa758f7f301 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,7 @@
+#-----------------------------------------------------------------------------\r
+# Build jpeg lib first:\r
 SUBDIRS(jpeg)\r
 \r
-#CXXFLAGS = @CXXFLAGS@ -DPUB_DICT_PATH=\"$(datadir)/gdcm/\" \\r
-#           -D__STDC_LIMIT_MACROS  # Refer to stdint.h\r
-\r
 INCLUDE_DIRECTORIES(\r
   ${GDCM_SOURCE_DIR}/jpeg/\r
 )\r
@@ -28,48 +27,20 @@ SET(libgdcm_la_SOURCES
        gdcmParse.cxx\r
        gdcmJpegIdo.cxx\r
 )\r
-#Why one should not use ADD_DEFINITIONS\r
-#http://www.cmake.org/pipermail/cmake/2003-September/004286.html\r
-#ADD_DEFINITIONS(-DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}/\\")\r
-#ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS)\r
-\r
-#SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES} \r
-#  PROPERTIES \r
-#  COMPILE_FLAGS  -D__STDC_LIMIT_MACROS\r
-#  COMPILE_FLAGS  -DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\"\r
-#)\r
+#-----------------------------------------------------------------------------\r
+# Why one should not use ADD_DEFINITIONS\r
+# http://www.cmake.org/pipermail/cmake/2003-September/004286.html\r
 \r
+#-----------------------------------------------------------------------------\r
+# __STDC_LIMIT_MACROS -> Refer to stdint.h\r
+# http://www.cmake.org/pipermail/cmake/2003-October/004369.html\r
+# http://www.cmake.org/pipermail/cmake/2003-October/004373.html\r
 \r
 SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}\r
   PROPERTIES\r
   COMPILE_FLAGS "-D__STDC_LIMIT_MACROS -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""\r
 )\r
 \r
-\r
-\r
-#libgdcminclude_HEADERS =   \\r
-#      gdcmException.h    \\r
-#      gdcmHeader.h       \\r
-#      gdcmHeaderHelper.h \\r
-#      gdcmCommon.h       \\r
-#      gdcm.h             \\r
-#      gdcmDictSet.h      \\r
-#      gdcmDict.h         \\r
-#      gdcmDictEntry.h    \\r
-#      gdcmElValue.h      \\r
-#      gdcmElValSet.h     \\r
-#      gdcmVR.h           \\r
-#      gdcmTS.h           \\r
-#      gdcmFile.h\r
-\r
-#EXTRA_DIST =            \\r
-#      gdcmUtil.h      \\r
-#      gdcmIdo.h       \\r
-#      iddcmjpeg.h\r
-\r
-\r
-\r
-\r
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )\r
 #TODO this is not working out of the box (on the first time)\r
 IF(UNIX)\r
@@ -83,4 +54,12 @@ ELSE(UNIX)
     gdcmijpeg12\r
     Wsock32.lib   #doesn't exist on cygwin\r
   )\r
-ENDIF(UNIX)
\ No newline at end of file
+ENDIF(UNIX)\r
+\r
+#The following is not wroking because when a header file is not found it tries \r
+#to find one in the binary dir\r
+#INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})\r
+#INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)\r
+INSTALL_FILES(/include "\\.h$")\r
+\r
+INSTALL_TARGETS(/lib/ gdcm)
\ No newline at end of file