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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4218ea9bfc765c1d1acf178768d557d728823b81..62a568a54845920cbcaacab9569c73734ebe83c3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,8 @@
 PROJECT(GDCM)\r
 CMAKE_MINIMUM_REQUIRED(VERSION 1.8)\r
 \r
-# The GDCM version number.\r
+#-----------------------------------------------------------------------------\r
+# GDCM version number, usefull for packaging and doxygen doc:\r
 SET(GDCM_VERSION_MAJOR 0)\r
 SET(GDCM_VERSION_MINOR 4)\r
 SET(GDCM_VERSION_PATCH 0)\r
@@ -34,8 +35,8 @@ SET(GDCM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 # Build directory on which many applications depend\r
 SUBDIRS(\r
   src\r
-  Test\r
   Dicts\r
+  Test\r
 )\r
 \r
 #-----------------------------------------------------------------------------\r

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index d89e386b5ae2741409ef9a4b0c916bad395c72a8..e8650ae21aa47a69f77616045c24b73a79921095 100644 (file)
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -1,3 +1,6 @@
+#-----------------------------------------------------------------------------\r
+# DICOM dictionary stuff\r
+\r
 #SET(dictsdir \r
 #  ${GDCM_SOURCE_DIR}/gdcm\r
 #)\r
@@ -11,6 +14,5 @@
 #  dicomV3.dic\r
 #)\r
 \r
-#IF(UNIX)\r
-  INSTALL_FILES(${GDCM_DATA_DIR} FILES dicomV3.dic README)\r
-#ENDIF(UNIX)
\ No newline at end of file
+# For now INSTALL doesn't work on Win32 \r
+INSTALL_FILES(${GDCM_DATA_DIR} FILES dicomV3.dic README)\r

diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt
index cfa963fe86042abe41dd3f384add789c2245fca1..25076fcdb048a9d346873c5ebe9aa8a24d9a8231 100644 (file)
--- a/Doc/CMakeLists.txt
+++ b/Doc/CMakeLists.txt
@@ -20,25 +20,17 @@ SET(TARGET_DIR
 
 IF(GDCM_DOXYGEN)
 
-#  ADD_CUSTOM_COMMAND(
-#      SOURCE    ${GDCM_SOURCE_DIR}/Doc/DoxyfileDeveloppers
-#      COMMAND   ${DOXYGEN}
-#      ARGS      ${GDCM_SOURCE_DIR}/Doc/DoxyfileDeveloppers
-#      TARGET    mathieu
-#      OUTPUT   ${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx
-#)
-
-# http://www.cmake.org/pipermail/cmake/2003-April/003673.html
-# Too bad CMake doesn't support multiline ""
-SET(GDCM_DOXYGEN_INPUT_COMMON
-  "${GDCM_SOURCE_DIR}/src   ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt   ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt  ${GDCM_SOURCE_DIR}/Doc/DoxyInstallation.txt  ${GDCM_SOURCE_DIR}/Doc/DoxyIntroduction.txt"
-)
-SET(GDCM_DOXYGEN_EXCLUDE_COMMON
-)
+  # http://www.cmake.org/pipermail/cmake/2003-April/003673.html
+  # Too bad CMake doesn't support multiline ""
+  SET(GDCM_DOXYGEN_INPUT_COMMON
+    "${GDCM_SOURCE_DIR}/src   ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt   ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt  ${GDCM_SOURCE_DIR}/Doc/DoxyInstallation.txt  ${GDCM_SOURCE_DIR}/Doc/DoxyIntroduction.txt"
+  )
+  SET(GDCM_DOXYGEN_EXCLUDE_COMMON
+  )
 
-#Should rewrote this thing with FOREACH:
-#-----------------------------------------------------------------------------
-# Build the documentation for developpers
+  #Should rewrote this thing with FOREACH:
+  #-----------------------------------------------------------------------------
+  # Build the documentation for developpers
 
   SET(GDCM_HTML_OUTPUT
     html.developper
@@ -60,8 +52,8 @@ SET(GDCM_DOXYGEN_EXCLUDE_COMMON
    ${DOXYGEN}
    ${GDCM_BINARY_DIR}/Doc/DoxyfileDeveloppers)
 
-#-----------------------------------------------------------------------------
-# Build the documentation for user
+  #-----------------------------------------------------------------------------
+  # Build the documentation for user
 
   SET(GDCM_HTML_OUTPUT
     html.user
@@ -85,7 +77,7 @@ SET(GDCM_DOXYGEN_EXCLUDE_COMMON
 
 
   INSTALL_FILES(${HTML_DIR} "\\.css$")
-  INSTALL_FILES(${HTML_DIR} "\\.gif$")
+  INSTALL_FILES(${HTML_DIR} "\\.png$")
   INSTALL_FILES(${HTML_DIR} "\\.html$")
   #INSTALL_FILES(${HTML_DIR} "\\.pl$")
   #INSTALL_FILES(${HTML_DIR} "\\.stop$")

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

diff --git a/src/jpeg/libijg/CMakeLists.txt b/src/jpeg/libijg/CMakeLists.txt
index d3f0727d3fc53ec3799ed0b0806350c8cd4406b0..38a5346c3ab184814ebd5dec95a172751d16f64d 100644 (file)
--- a/src/jpeg/libijg/CMakeLists.txt
+++ b/src/jpeg/libijg/CMakeLists.txt
@@ -73,4 +73,11 @@ SET(libgdcmijpeg8include_HEADERS
 #   jconfig.linux \\r
 #   jconfig.vc\r
 \r
-ADD_LIBRARY(gdcmijpeg8 ${libgdcmijpeg8_la_SOURCES})
\ No newline at end of file
+ADD_LIBRARY(gdcmijpeg8 ${libgdcmijpeg8_la_SOURCES})\r
+\r
+#INSTALL_FILES(/include "\\.h$")\r
+INSTALL_FILES(/include FILES ${libgdcmijpeg8include_HEADERS})\r
+#INSTALL_FILES(/include FILES jconfig.linux jconfig.vc)\r
+INSTALL_FILES(/include FILES jconfig.linux)\r
+\r
+INSTALL_TARGETS(/lib/ gdcmijpeg8)
\ No newline at end of file

diff --git a/src/jpeg/libijg12/CMakeLists.txt b/src/jpeg/libijg12/CMakeLists.txt
index 257f08a3d7dad93c0cb4aeb58b02987badbc5236..71d4f3e44df44f4e3ecdf6044a237ff36d89547d 100644 (file)
--- a/src/jpeg/libijg12/CMakeLists.txt
+++ b/src/jpeg/libijg12/CMakeLists.txt
@@ -1,8 +1,5 @@
-#LTVERSION = 0:1:0\r
-\r
-#lib_LTLIBRARIES = libgdcmijpeg12.la\r
-\r
-##CXXFLAGS = @CXXFLAGS@\r
+#-----------------------------------------------------------------------------\r
+# Build jpeg lib for 12 bits:\r
 \r
 SET(libgdcmijpeg12_la_SOURCES\r
        jcapimin12.c\r
@@ -53,7 +50,6 @@ SET(libgdcmijpeg12_la_SOURCES
        jmemnobs12.c\r
 )\r
 \r
-#libgdcmijpeg12includedir = $(includedir)\r
 SET(libgdcmijpeg12include_HEADERS\r
        jchuff12.h\r
        jconfig12.h\r
@@ -72,4 +68,11 @@ SET(libgdcmijpeg12include_HEADERS
 #   jconfig.linux \\r
 #   jconfig.vc\r
 \r
-ADD_LIBRARY(gdcmijpeg12 ${libgdcmijpeg12_la_SOURCES})
\ No newline at end of file
+ADD_LIBRARY(gdcmijpeg12 ${libgdcmijpeg12_la_SOURCES})\r
+\r
+#INSTALL_FILES(/include "\\.h$")\r
+INSTALL_FILES(/include FILES ${libgdcmijpeg12include_HEADERS})\r
+#INSTALL_FILES(/include FILES jconfig.linux jconfig.vc)\r
+INSTALL_FILES(/include FILES jconfig.linux)\r
+\r
+INSTALL_TARGETS(/lib/ gdcmijpeg12)
\ No newline at end of file

diff --git a/src/jpeg/libijg8/CMakeLists.txt b/src/jpeg/libijg8/CMakeLists.txt
index d3f0727d3fc53ec3799ed0b0806350c8cd4406b0..38a5346c3ab184814ebd5dec95a172751d16f64d 100644 (file)
--- a/src/jpeg/libijg8/CMakeLists.txt
+++ b/src/jpeg/libijg8/CMakeLists.txt
@@ -73,4 +73,11 @@ SET(libgdcmijpeg8include_HEADERS
 #   jconfig.linux \\r
 #   jconfig.vc\r
 \r
-ADD_LIBRARY(gdcmijpeg8 ${libgdcmijpeg8_la_SOURCES})
\ No newline at end of file
+ADD_LIBRARY(gdcmijpeg8 ${libgdcmijpeg8_la_SOURCES})\r
+\r
+#INSTALL_FILES(/include "\\.h$")\r
+INSTALL_FILES(/include FILES ${libgdcmijpeg8include_HEADERS})\r
+#INSTALL_FILES(/include FILES jconfig.linux jconfig.vc)\r
+INSTALL_FILES(/include FILES jconfig.linux)\r
+\r
+INSTALL_TARGETS(/lib/ gdcmijpeg8)
\ No newline at end of file

diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt
index e5e30ff7890325b2b52fe6d53fd693341d6e72d2..a9a19244dae2d22893f1ff9beed786170761cee4 100644 (file)
--- a/vtk/CMakeLists.txt
+++ b/vtk/CMakeLists.txt
@@ -1,5 +1,8 @@
-#VTK GDCM subdir\r
+#-----------------------------------------------------------------------------\r
+# VTK GDCM Reader subdir\r
 \r
+#-----------------------------------------------------------------------------\r
+# Need gdcm header files\r
 INCLUDE_DIRECTORIES(\r
   ${GDCM_SOURCE_DIR}/src/\r
 )\r
@@ -8,6 +11,8 @@ SET(VTKGDCM_LIB_SRCS
   vtkGdcmReader.cxx\r
 )\r
 \r
+#-----------------------------------------------------------------------------\r
+# Create vtkgdcm library\r
 ADD_LIBRARY(vtkgdcm ${VTKGDCM_LIB_SRCS})\r
 TARGET_LINK_LIBRARIES(vtkgdcm \r
   gdcm\r
@@ -16,6 +21,8 @@ TARGET_LINK_LIBRARIES(vtkgdcm
   vtkFiltering\r
 )\r
 \r
+#-----------------------------------------------------------------------------\r
+# See with frog why m4 didn't link to lib, and include cxx file instead ?\r
 SET(vtkgdcmdemo_SOURCES\r
   testvtkGdcmReader.cxx\r
 #  vtkGdcmReader.cxx\r
@@ -27,6 +34,8 @@ TARGET_LINK_LIBRARIES(vtkgdcmdemo
   vtkRendering\r
 )\r
 \r
+#-----------------------------------------------------------------------------\r
+# See with frog why m4 didn't link to lib, and include cxx file instead ?\r
 SET(vtkgdcmViewer_SOURCES\r
   vtkgdcmViewer.cxx\r
   #vtkGdcmReader.cxx \r
@@ -35,4 +44,7 @@ ADD_EXECUTABLE(vtkgdcmViewer ${vtkgdcmViewer_SOURCES})
 TARGET_LINK_LIBRARIES(vtkgdcmViewer \r
   vtkgdcm\r
   vtkRendering\r
-)
\ No newline at end of file
+)\r
+\r
+# Install vtk header\r
+INSTALL_FILES(/include FILES vtkGdcmReader.h)
\ No newline at end of file