ENH: This time for real. Install is ok. STYLE: some minor stuff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a086dae7f747b1902daf71472a60ede0a1c238fa..b13580cfd39231945ca902c43b2e2ab9b1f253c5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,7 +250,6 @@ CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
 
 INSTALL_FILES(/include/gdcm .h gdcmConfigure.h)
-INSTALL_FILES(/lib .cmake GDCMBuildSettings  GDCMConfig  GDCMLibraryDepends)
 
 #-----------------------------------------------------------------------------
 # Add the testing directories

diff --git a/GDCMConfig.cmake.in b/GDCMConfig.cmake.in
deleted file mode 100644 (file)
index 8987890..0000000
--- a/GDCMConfig.cmake.in
+++ /dev/null
@@ -1,17 +0,0 @@
-SET(GDCM_MAJOR_VERSION "@GDCM_MAJOR_VERSION@")
-SET(GDCM_MINOR_VERSION "@GDCM_MINOR_VERSION@")
-SET(GDCM_BUILD_VERSION "@GDCM_BUILD_VERSION@")
-
-SET(GDCM_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
-SET(GDCM_USE_FILE "@GDCM_USE_FILE@")
-
-SET(GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_DIRS@")
-SET(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIRS@")
-
-# The build settings file.
-SET(GDCM_BUILD_SETTINGS_FILE "@GDCM_BUILD_SETTINGS_FILE@")
-
-# The GDCM library dependencies.
-IF(NOT GDCM_NO_LIBRARY_DEPENDS)
-  INCLUDE("@GDCM_LIBRARY_DEPENDS_FILE@")
-ENDIF(NOT GDCM_NO_LIBRARY_DEPENDS)

diff --git a/GDCMUse.cmake b/GDCMUse.cmake
deleted file mode 100644 (file)
index 515da0c..0000000
--- a/GDCMUse.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-IF(GDCM_FOUND)
-  # Nothing here for now
-   # Load the compiler settings used for GDCM
-  IF(GDCM_BUILD_SETTINGS_FILE)
-    INCLUDE(${CMAKE_ROOT}/Modules/CMakeImportBuildSettings.cmake)
-    CMAKE_IMPORT_BUILD_SETTINGS(${GDCM_BUILD_SETTINGS_FILE})
-  ENDIF(GDCM_BUILD_SETTINGS_FILE)
-
-  # Add compiler flags needed to use VTK.
-  #  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VTK_REQUIRED_C_FLAGS}")
-  #  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VTK_REQUIRED_CXX_FLAGS}")
-  #  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${VTK_REQUIRED_EXE_LINKER_FLAGS}")
-  #  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${VTK_REQUIRED_SHARED_LINKER_FLAGS}")
-  #  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${VTK_REQUIRED_MODULE_LINKER_FLAGS}")
-
-  # Add include directories needed to use GDCM
-  INCLUDE_DIRECTORIES(${GDCM_INCLUDE_DIRS})
-
-  # Add link directories needed to use GDCM
-  LINK_DIRECTORIES(${GDCM_LIBRARY_DIRS})
-
-ENDIF(GDCM_FOUND)

diff --git a/Testing/TestReadWriteReadCompare.cxx b/Testing/TestReadWriteReadCompare.cxx
index 7f62c0b7019c9cfccc6a98998d0596b77baa74de..0499ab6e5eb62b091a66e91bc386c5b2981ee8d6 100644 (file)
--- a/Testing/TestReadWriteReadCompare.cxx
+++ b/Testing/TestReadWriteReadCompare.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestReadWriteReadCompare.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/25 14:52:31 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2006/05/05 22:13:55 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,7 +21,7 @@
 
 //Generated file:
 #include "gdcmDataImages.h"
- 
+
 int CompareInternal(std::string const &filename, std::string const &output)
 {
    std::cout << "   Testing: " << filename << std::endl;

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b00eb68a9691f85ee2ce04b1a32ccd14dab82bda..6325c3be8974511f3c302101cfa57375cc34a95a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,8 @@
 # Rebuild gdcm whenever a file starting with gdcm* is modified
 INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
 
+SET(GDCM_LIBRARIES gdcm CACHE INTERNAL "libraries for GDCM")
+
 SET(OPJ_PREFIX gdcm)
 SUBDIRS(
   gdcmjpeg
@@ -19,7 +21,7 @@ INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/gdcmopenjpeg/libopenjpeg
 )
 
-SET(libgdcm_la_SOURCES
+SET(GDCM_SOURCES
    gdcmArgMgr.cxx
    gdcmBase.cxx
    gdcmCallbackCommand.cxx
@@ -81,7 +83,7 @@ IF(NOT BUILD_SHARED_LIBS)
    COMPILE_FLAGS -DOPJ_STATIC)
 ENDIF(NOT BUILD_SHARED_LIBS)
 
-ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES})
+ADD_LIBRARY(gdcm ${GDCM_SOURCES})
 TARGET_LINK_LIBRARIES(gdcm 
   gdcmjpeg8 
   gdcmjpeg12
@@ -101,5 +103,18 @@ IF(CMAKE_SYSTEM MATCHES "SunOS.*")
   TARGET_LINK_LIBRARIES(gdcm socket nsl)
 ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
 
-INSTALL_FILES(/include/gdcm "\\.h$")
-INSTALL_TARGETS(/lib/gdcm/ gdcm)
+IF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+  # Install header file used to construct the lib
+  #INSTALL_FILES(
+  #  ${GDCM_INSTALL_INCLUDE_DIR} .h ${GDCM_SOURCES})
+  INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} "\\.h$")
+ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT)
+
+IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+  #Install the target itself
+  INSTALL_TARGETS(
+    ${GDCM_INSTALL_LIB_DIR}
+    RUNTIME_DIRECTORY ${GDCM_INSTALL_BIN_DIR}
+    ${GDCM_LIBRARIES})
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
+

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index d2991e701c874f6862f9ab85fb4bbd6e267ddc96..8ac4b2296ae0d43209ef487b7bfed0319bf1e90c 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.346 $
+  Date:      $Date: 2006/05/05 22:13:55 $
+  Version:   $Revision: 1.347 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1744,18 +1744,18 @@ void Document::FixDocEntryFoundLength(DocEntry *entry,
         gdcmErrorMacro( "This looks like to a buggy Siemens DICOM file."
         "The length of this tag seems to be wrong" );
       }
-   } 
- 
+   }
+
    else if ( entry->GetVR() == "SQ" )
    {
-      foundLength = 0;      // ReadLength is unchanged 
-   } 
-    
-   //////// We encountered a 'delimiter' element i.e. a tag of the form 
+      foundLength = 0;      // ReadLength is unchanged
+   }
+
+   //////// We encountered a 'delimiter' element i.e. a tag of the form
    // "fffe|xxxx" which is just a marker. Delimiters length should not be
    // taken into account.
    else if ( gr == 0xfffe )
-   {    
+   {
      // According to the norm, fffe|0000 shouldn't exist. BUT the Philips
      // image gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm happens to
      // causes extra troubles...
@@ -1767,7 +1767,7 @@ void Document::FixDocEntryFoundLength(DocEntry *entry,
      {
         foundLength=12; // to skip the mess that follows this bugged Tag !
      }
-   }                
+   }
    entry->SetLength(foundLength);
 }
 

diff --git a/src/gdcmjpeg/12/CMakeLists.txt b/src/gdcmjpeg/12/CMakeLists.txt
index a50a77f297ad90d8ee3679196ba56beedefe0bd4..4d930d4f1d0050a19759407d1426b9b8fd28a3b6 100644 (file)
--- a/src/gdcmjpeg/12/CMakeLists.txt
+++ b/src/gdcmjpeg/12/CMakeLists.txt
@@ -4,6 +4,11 @@ INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_BINARY_DIR}"
   "${GDCMJPEG_SOURCE_DIR}")
 ADD_LIBRARY(gdcmjpeg12 ${JPEG_SOURCES})
-INSTALL_TARGETS(/lib/gdcm/ gdcmjpeg12)
 
+IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+  INSTALL_TARGETS(
+    ${GDCM_INSTALL_LIB_DIR}
+    RUNTIME_DIRECTORY ${GDCM_INSTALL_BIN_DIR}
+    gdcmjpeg12)
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
 

diff --git a/src/gdcmjpeg/16/CMakeLists.txt b/src/gdcmjpeg/16/CMakeLists.txt
index 369c9d59ad903b8202fd15a4cdd49f81517cf944..f44ccd9e3d8f43579e629551415711bc7e701e33 100644 (file)
--- a/src/gdcmjpeg/16/CMakeLists.txt
+++ b/src/gdcmjpeg/16/CMakeLists.txt
@@ -4,6 +4,11 @@ INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_BINARY_DIR}"
   "${GDCMJPEG_SOURCE_DIR}")
 ADD_LIBRARY(gdcmjpeg16 ${JPEG_SOURCES})
-INSTALL_TARGETS(/lib/gdcm/ gdcmjpeg16)
 
+IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+  INSTALL_TARGETS(
+    ${GDCM_INSTALL_LIB_DIR}
+    RUNTIME_DIRECTORY ${GDCM_INSTALL_BIN_DIR}
+    gdcmjpeg16)
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
 

diff --git a/src/gdcmjpeg/8/CMakeLists.txt b/src/gdcmjpeg/8/CMakeLists.txt
index 9c6a1e7ce36a3663a27d393cebd10e140e600155..c5c20a6a5c3174de6449bd1ca96886b105c94922 100644 (file)
--- a/src/gdcmjpeg/8/CMakeLists.txt
+++ b/src/gdcmjpeg/8/CMakeLists.txt
@@ -4,5 +4,11 @@ INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_BINARY_DIR}"
   "${GDCMJPEG_SOURCE_DIR}")
 ADD_LIBRARY(gdcmjpeg8 ${JPEG_SOURCES})
-INSTALL_TARGETS(/lib/gdcm/ gdcmjpeg8)
+
+IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+  INSTALL_TARGETS(
+    ${GDCM_INSTALL_LIB_DIR}
+    RUNTIME_DIRECTORY ${GDCM_INSTALL_BIN_DIR}
+    gdcmjpeg8)
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)
 

diff --git a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
index 4a0259eab2b3d69d8d272fe5e80bb7ce5014670f..965759c2b3cc58566de422b1bb8d6a9739c8f3bd 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
+++ b/src/gdcmopenjpeg/libopenjpeg/CMakeLists.txt
@@ -34,5 +34,10 @@ ENDIF (WIN32)
 ADD_LIBRARY(${OPJ_PREFIX}openjpeg ${OpenJPEG_SRCS})
 
 # Install library
-INSTALL_TARGETS(/lib/gdcm ${OPJ_PREFIX}openjpeg)
+IF(NOT GDCM_INSTALL_NO_LIBRARIES)
+  INSTALL_TARGETS(
+    ${GDCM_INSTALL_LIB_DIR}
+    RUNTIME_DIRECTORY ${GDCM_INSTALL_BIN_DIR}
+    ${OPJ_PREFIX}openjpeg)
+ENDIF(NOT GDCM_INSTALL_NO_LIBRARIES)