Enable build with shared libraries

Fix building with BUILD_SHARED_LIBS set to ON. Cleaning unused utilities and cmake scripts. Removing rtkcuda_EXPORT to exclusively use RTK_EXPORT. Future commits should remove rtkWin32Header.h to use the auto-generated header RTKExport.h instead.
RTKConsortium · Nov 7, 2017 · f23cef7 · f23cef7
1 parent 154abe2
commit f23cef7
Show file tree

Hide file tree

Showing 451 changed files with 167 additions and 140,871 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,15 +1,31 @@
 #=========================================================
-# RTK
+# RTK : Reconstruction Toolkit
 #=========================================================
 cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 if(WIN32 OR NOT EXISTS /dev/urandom)
   cmake_minimum_required(VERSION 2.8.5)
 endif()
 
+## Tell CMake to be quiet
+cmake_policy(SET CMP0003 NEW)
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 NEW)
+endif()
+
 project(RTK)
 
+## RTK Version
+set(RTK_VERSION_MAJOR "1")
+set(RTK_VERSION_MINOR "3")
+set(RTK_VERSION_PATCH "0")
+
 set(RTK_LIBRARIES RTK)
 
+## Default to release
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif ()
+
 #=========================================================
 # Installation variables
 #=========================================================
@@ -38,11 +54,34 @@ if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
 endif()
 
-#Initialization
+#=========================================================
+# Remove some Intel compiler warnings
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+  string(REPLACE "-Wno-unused-parameter" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+  if(WIN32)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qwd1268")
+  else()
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd1268")
+  endif()
+endif()
+
+# --------------------------------------------------------
+# Shared libraries option
+set(RTK_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+
+# --------------------------------------------------------
+# Initialization
 if(NOT ITK_SOURCE_DIR)
     include(itk-module-init.cmake)
 endif()
 
+#=========================================================
+# If choose to build documentation, then search for Doxygen executables.
+option(BUILD_DOXYGEN "Build Doxygen Documentation" OFF)
+if(BUILD_DOXYGEN)
+  add_subdirectory(documentation/Doxygen)
+endif()
+
 #=========================================================
 # lp_solve library
 #=========================================================
@@ -66,6 +105,13 @@ if(NOT ITK_SOURCE_DIR)
   find_package(ITK 4.2.0 REQUIRED)
 endif()
 
+if(ITK_VERSION_MINOR LESS "4")
+  include_directories(BEFORE utilities/itkImageScanlineConstIterator)
+endif()
+if(ITK_VERSION_MINOR LESS "5")
+  include_directories(BEFORE utilities/itkBinShrinkImageFilter)
+endif()
+
 #=========================================================
 # ITKCudaCommon
 #=========================================================
@@ -95,6 +141,13 @@ else()
   itk_module_impl()
 endif()
 
+#=========================================================
+# Generate RTKConfig.cmake for the build tree.
+set (RTK_USE_FILE "${RTK_SOURCE_DIR}/cmake/UseRTK.cmake")
+set (RTK_LIBRARY_DIRS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+configure_file(cmake/RTKConfig.cmake.in RTKConfig.cmake @ONLY)
+configure_file(cmake/RTKConfigVersion.cmake.in RTKConfigVersion.cmake @ONLY)
+
 #-----------------------------------------------------------------------------
 # The subdirectories added below this line should use only the public
 # interface with find_package(ITK). Set ITK_DIR to use this ITK build.

diff --git a/cmake/RTKExternalData.cmake b/cmake/RTKExternalData.cmake
diff --git a/include/rtkConjugateGradientConeBeamReconstructionFilter.h b/include/rtkConjugateGradientConeBeamReconstructionFilter.h
@@ -117,12 +117,6 @@ class ConjugateGradientConeBeamReconstructionFilter : public rtk::IterativeConeB
     /** Run-time type information (and related methods). */
     itkTypeMacro(ConjugateGradientConeBeamReconstructionFilter, itk::ImageToImageFilter)
 
-    /** The 3D image to be updated */
-    void SetInputVolume(const TOutputImage* Volume);
-
-    /** The gated measured projections */
-    void SetInputProjectionStack(const TOutputImage* Projection);
-
     typedef rtk::ForwardProjectionImageFilter< TOutputImage, TOutputImage >  ForwardProjectionFilterType;
     typedef typename ForwardProjectionFilterType::Pointer                    ForwardProjectionFilterPointer;
     typedef rtk::BackProjectionImageFilter< TOutputImage, TOutputImage >     BackProjectionFilterType;

diff --git a/include/rtkCudaAverageOutOfROIImageFilter.h b/include/rtkCudaAverageOutOfROIImageFilter.h
@@ -40,7 +40,7 @@ namespace rtk
  *
  * \ingroup CudaImageToImageFilter
  */
-class ITK_EXPORT CudaAverageOutOfROIImageFilter :
+class RTK_EXPORT CudaAverageOutOfROIImageFilter :
     public itk::CudaInPlaceImageFilter< itk::CudaImage<float,4>, itk::CudaImage<float,4>,
   AverageOutOfROIImageFilter< itk::CudaImage<float,4>, itk::CudaImage<float,3> > >
 
@@ -59,7 +59,7 @@ class ITK_EXPORT CudaAverageOutOfROIImageFilter :
   itkTypeMacro(CudaAverageOutOfROIImageFilter, AverageOutOfROIImageFilter)
 
 protected:
-  rtkcuda_EXPORT CudaAverageOutOfROIImageFilter();
+  CudaAverageOutOfROIImageFilter();
   ~CudaAverageOutOfROIImageFilter(){
   }
 

diff --git a/include/rtkCudaBackProjectionImageFilter.h b/include/rtkCudaBackProjectionImageFilter.h
@@ -45,7 +45,7 @@ namespace rtk
  *
  * \ingroup Projector CudaImageToImageFilter
  */
-class CudaBackProjectionImageFilter :
+class RTK_EXPORT CudaBackProjectionImageFilter :
   public itk::CudaInPlaceImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
   BackProjectionImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3> > >
 {
@@ -70,7 +70,7 @@ class CudaBackProjectionImageFilter :
   itkTypeMacro(CudaBackProjectionImageFilter, Superclass);
 
 protected:
-  rtkcuda_EXPORT CudaBackProjectionImageFilter();
+  CudaBackProjectionImageFilter();
   virtual ~CudaBackProjectionImageFilter() {};
 
   virtual void GPUGenerateData();

diff --git a/include/rtkCudaConjugateGradientImageFilter_3f.h b/include/rtkCudaConjugateGradientImageFilter_3f.h
@@ -40,9 +40,9 @@ namespace rtk
  * \ingroup CudaImageToImageFilter
  */
 
-  class ITK_EXPORT CudaConjugateGradientImageFilter_3f :
-        public itk::CudaImageToImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
-    ConjugateGradientImageFilter< itk::CudaImage<float,3> > >
+class RTK_EXPORT CudaConjugateGradientImageFilter_3f :
+  public itk::CudaImageToImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
+         ConjugateGradientImageFilter< itk::CudaImage<float,3> > >
 {
 public:
   /** Standard class typedefs. */
@@ -59,7 +59,7 @@ namespace rtk
   itkTypeMacro(CudaConjugateGradientImageFilter_3f, ConjugateGradientImageFilter)
 
 protected:
-  rtkcuda_EXPORT CudaConjugateGradientImageFilter_3f();
+  CudaConjugateGradientImageFilter_3f();
   ~CudaConjugateGradientImageFilter_3f(){
   }
 

diff --git a/include/rtkCudaConjugateGradientImageFilter_4f.h b/include/rtkCudaConjugateGradientImageFilter_4f.h
@@ -40,9 +40,9 @@ namespace rtk
  * \ingroup CudaImageToImageFilter
  */
 
-  class ITK_EXPORT CudaConjugateGradientImageFilter_4f :
-        public itk::CudaImageToImageFilter< itk::CudaImage<float,4>, itk::CudaImage<float,4>,
-    ConjugateGradientImageFilter< itk::CudaImage<float,4> > >
+class RTK_EXPORT CudaConjugateGradientImageFilter_4f :
+  public itk::CudaImageToImageFilter< itk::CudaImage<float,4>, itk::CudaImage<float,4>,
+         ConjugateGradientImageFilter< itk::CudaImage<float,4> > >
 {
 public:
   /** Standard class typedefs. */
@@ -59,7 +59,7 @@ namespace rtk
   itkTypeMacro(CudaConjugateGradientImageFilter_4f, ConjugateGradientImageFilter)
 
 protected:
-  rtkcuda_EXPORT CudaConjugateGradientImageFilter_4f();
+  CudaConjugateGradientImageFilter_4f();
   ~CudaConjugateGradientImageFilter_4f(){
   }
 

diff --git a/include/rtkCudaConstantVolumeSeriesSource.h b/include/rtkCudaConstantVolumeSeriesSource.h
@@ -40,9 +40,9 @@ namespace rtk
  * \ingroup CudaImageToImageFilter
  */
 
-  class ITK_EXPORT CudaConstantVolumeSeriesSource :
-        public itk::CudaImageToImageFilter< itk::CudaImage<float,4>, itk::CudaImage<float,4>,
-    ConstantImageSource< itk::CudaImage<float,4> > >
+class RTK_EXPORT CudaConstantVolumeSeriesSource :
+  public itk::CudaImageToImageFilter< itk::CudaImage<float,4>, itk::CudaImage<float,4>,
+         ConstantImageSource< itk::CudaImage<float,4> > >
 {
 public:
   /** Standard class typedefs. */
@@ -59,7 +59,7 @@ namespace rtk
   itkTypeMacro(CudaConstantVolumeSeriesSource, ImageToImageFilter)
 
 protected:
-  rtkcuda_EXPORT CudaConstantVolumeSeriesSource();
+  CudaConstantVolumeSeriesSource();
   ~CudaConstantVolumeSeriesSource(){
   }
 

diff --git a/include/rtkCudaConstantVolumeSource.h b/include/rtkCudaConstantVolumeSource.h
@@ -40,9 +40,9 @@ namespace rtk
  * \ingroup CudaImageToImageFilter
  */
 
-  class ITK_EXPORT CudaConstantVolumeSource :
-        public itk::CudaImageToImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
-    ConstantImageSource< itk::CudaImage<float,3> > >
+class RTK_EXPORT CudaConstantVolumeSource :
+  public itk::CudaImageToImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
+         ConstantImageSource< itk::CudaImage<float,3> > >
 {
 public:
   /** Standard class typedefs. */
@@ -59,7 +59,7 @@ namespace rtk
   itkTypeMacro(CudaConstantVolumeSource, ImageToImageFilter)
 
 protected:
-  rtkcuda_EXPORT CudaConstantVolumeSource();
+  CudaConstantVolumeSource();
   ~CudaConstantVolumeSource(){
   }
 

diff --git a/include/rtkCudaCropImageFilter.h b/include/rtkCudaCropImageFilter.h
@@ -45,7 +45,7 @@ namespace rtk
  * \ingroup CudaImageToImageFilter
  *
  */
-class CudaCropImageFilter :
+class RTK_EXPORT CudaCropImageFilter :
   public itk::CudaImageToImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
   itk::CropImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3> > >
 {
@@ -65,7 +65,7 @@ class CudaCropImageFilter :
   itkTypeMacro(CudaCropImageFilter, ImageToImageFilter);
 
 protected:
-  rtkcuda_EXPORT CudaCropImageFilter();
+  CudaCropImageFilter();
   virtual ~CudaCropImageFilter() {};
 
   virtual void GPUGenerateData();

diff --git a/include/rtkCudaCyclicDeformationImageFilter.h b/include/rtkCudaCyclicDeformationImageFilter.h
@@ -41,7 +41,7 @@ namespace rtk
  * \ingroup CudaImageToImageFilter
  */
 
-class ITK_EXPORT CudaCyclicDeformationImageFilter :
+class RTK_EXPORT CudaCyclicDeformationImageFilter :
 public itk::CudaImageToImageFilter< itk::CudaImage<itk::CovariantVector<float,3>, 4>,
                                     itk::CudaImage<itk::CovariantVector<float,3>, 3>,
                                     CyclicDeformationImageFilter< itk::CudaImage<itk::CovariantVector<float, 3>, 4>, itk::CudaImage<itk::CovariantVector<float, 3>, 3> > >
@@ -62,7 +62,7 @@ public itk::CudaImageToImageFilter< itk::CudaImage<itk::CovariantVector<float,3>
   itkTypeMacro(CudaCyclicDeformationImageFilter, CyclicDeformationImageFilter)
 
 protected:
-  rtkcuda_EXPORT CudaCyclicDeformationImageFilter();
+  CudaCyclicDeformationImageFilter();
   ~CudaCyclicDeformationImageFilter(){
   }
 

diff --git a/include/rtkCudaDisplacedDetectorImageFilter.h b/include/rtkCudaDisplacedDetectorImageFilter.h
@@ -44,7 +44,7 @@ namespace rtk
  * \author peter
  * \version 0.1
  */
-class CudaDisplacedDetectorImageFilter :
+class RTK_EXPORT CudaDisplacedDetectorImageFilter :
     public  itk::CudaInPlaceImageFilter<itk::CudaImage<float,3>, itk::CudaImage<float,3>,
             rtk::DisplacedDetectorImageFilter<itk::CudaImage<float, 3> > >
 {
@@ -68,7 +68,7 @@ class CudaDisplacedDetectorImageFilter :
 
 protected:
   /** Standard constructor **/
-  rtkcuda_EXPORT CudaDisplacedDetectorImageFilter();
+  CudaDisplacedDetectorImageFilter();
   /** Destructor **/
   virtual ~CudaDisplacedDetectorImageFilter();
 

diff --git a/include/rtkCudaFDKBackProjectionImageFilter.h b/include/rtkCudaFDKBackProjectionImageFilter.h
@@ -43,7 +43,7 @@ namespace rtk
  *
  * \ingroup Projector CudaImageToImageFilter
  */
-class  CudaFDKBackProjectionImageFilter :
+class RTK_EXPORT CudaFDKBackProjectionImageFilter :
   public itk::CudaInPlaceImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
   FDKBackProjectionImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3> > >
 {
@@ -68,7 +68,7 @@ class  CudaFDKBackProjectionImageFilter :
   itkTypeMacro(CudaFDKBackProjectionImageFilter, Superclass);
 
 protected:
-  rtkcuda_EXPORT CudaFDKBackProjectionImageFilter();
+  CudaFDKBackProjectionImageFilter();
   virtual ~CudaFDKBackProjectionImageFilter() {};
 
   virtual void GPUGenerateData();

diff --git a/include/rtkCudaFDKConeBeamReconstructionFilter.h b/include/rtkCudaFDKConeBeamReconstructionFilter.h
@@ -46,7 +46,7 @@ namespace rtk
  *
  * \ingroup ReconstructionAlgorithm CudaImageToImageFilter
  */
-class CudaFDKConeBeamReconstructionFilter :
+class RTK_EXPORT CudaFDKConeBeamReconstructionFilter :
   public itk::CudaInPlaceImageFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>,
   FDKConeBeamReconstructionFilter< itk::CudaImage<float,3>, itk::CudaImage<float,3>, float > >
 {
@@ -69,7 +69,7 @@ class CudaFDKConeBeamReconstructionFilter :
   itkTypeMacro(CudaFDKConeBeamReconstructionFilter, FDKConeBeamReconstructionFilter);
 
 protected:
-  rtkcuda_EXPORT CudaFDKConeBeamReconstructionFilter();
+  CudaFDKConeBeamReconstructionFilter();
   ~CudaFDKConeBeamReconstructionFilter(){}
 
   virtual void GPUGenerateData();

diff --git a/include/rtkCudaFDKWeightProjectionFilter.h b/include/rtkCudaFDKWeightProjectionFilter.h
@@ -45,9 +45,9 @@ namespace rtk
  * \author peter
  * \version 0.1
  */
-class CudaFDKWeightProjectionFilter :
-    public  itk::CudaInPlaceImageFilter<itk::CudaImage<float,3>, itk::CudaImage<float,3>,
-            rtk::FDKWeightProjectionFilter<itk::CudaImage<float, 3> > >
+class RTK_EXPORT CudaFDKWeightProjectionFilter :
+  public  itk::CudaInPlaceImageFilter<itk::CudaImage<float,3>, itk::CudaImage<float,3>,
+          rtk::FDKWeightProjectionFilter<itk::CudaImage<float, 3> > >
 {
 public:
   /** Convenience typedefs **/
@@ -69,7 +69,7 @@ class CudaFDKWeightProjectionFilter :
 
 protected:
   /** Standard constructor **/
-  rtkcuda_EXPORT CudaFDKWeightProjectionFilter();
+  CudaFDKWeightProjectionFilter();
   /** Destructor **/
   virtual ~CudaFDKWeightProjectionFilter();
 

diff --git a/include/rtkCudaFFTConvolutionImageFilter.h b/include/rtkCudaFFTConvolutionImageFilter.h
@@ -46,7 +46,7 @@ namespace rtk
  * \ingroup CudaImageToImageFilter
  */
 template< class TParentImageFilter >
-class ITK_EXPORT CudaFFTConvolutionImageFilter:
+class CudaFFTConvolutionImageFilter:
   public itk::CudaImageToImageFilter< itk::CudaImage<float,3>,
                                       itk::CudaImage<float,3>,
                                       TParentImageFilter >