From: jpr Date: Tue, 20 Sep 2011 16:05:15 +0000 (+0000) Subject: using EXPORT should help... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=gdcm.git;a=commitdiff_plain;h=a1ea1d8d8ff9680f050908255a7dcb0bd73a4851 using EXPORT should help... --- diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt index 892971ed..c14c477a 100644 --- a/vtk/CMakeLists.txt +++ b/vtk/CMakeLists.txt @@ -3,7 +3,6 @@ # Rebuild gdcm whenever a file starting with vtk* is modified INCLUDE_REGULAR_EXPRESSION("^vtk.*$") - if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif(COMMAND cmake_policy) @@ -98,13 +97,9 @@ SET(vtkgdcmViewer_SOURCES vtkgdcmViewer.cxx ) -#SET(vtkJPEGViewer_SOURCES -# vtkJPEGViewer.cxx -#) - -#SET(vtkJPEGViewer2_SOURCES -# vtkJPEGViewer2.cxx -#) +SET(vtkgdcmViewer2_SOURCES + vtkgdcmViewer2.cxx +) # let's do some APPLE/WIN32 magic here #IF(WIN32) @@ -144,8 +139,9 @@ SET(test4DSplitter_SOURCES ADD_EXECUTABLE(test4DSplitter ${GUI_EXECUTABLE} ${test4DSplitter_SOURCES}) TARGET_LINK_LIBRARIES( test4DSplitter - vtkgdcm + ${test4DSplitter_LINK_LIBRARIES} ) + #----------------------------------------------------------------------------- #SET(testEmilie1_SOURCES # testEmilie1.cxx @@ -202,7 +198,7 @@ TARGET_LINK_LIBRARIES(vtkWriteDicomExtended IF(NOT GDCM_INSTALL_NO_DEVELOPMENT) INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmReader.h) INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcmWriter.h) - INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcm4DSplitter.h) + INSTALL_FILES(${GDCM_INSTALL_INCLUDE_DIR} FILES vtkGdcm4DSplitter.h) ENDIF(NOT GDCM_INSTALL_NO_DEVELOPMENT) IF(NOT GDCM_INSTALL_NO_LIBRARIES) diff --git a/vtk/vtkGdcm4DSplitter.h b/vtk/vtkGdcm4DSplitter.h index 482f509c..eb46c74d 100644 --- a/vtk/vtkGdcm4DSplitter.h +++ b/vtk/vtkGdcm4DSplitter.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkGdcm4DSplitter.h,v $ Language: C++ - Date: $Date: 2011/04/20 15:03:54 $ - Version: $Revision: 1.12 $ + Date: $Date: 2011/09/20 16:05:15 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -39,7 +39,7 @@ typedef bool (*FoncComp)(GDCM_NAME_SPACE::File *file1, GDCM_NAME_SPACE::File *f //namespace GDCM_NAME_SPACE //{ - class vtkGdcm4DSplitter { + class VTK_EXPORT vtkGdcm4DSplitter { public: //-----------------------------------------------------------------------------