Merge

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c9769bab4b0c7a8b865ceb9fe5bba597610cde7..5bf1a02de46646e08d9459923c97558beb66a203 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ ENDIF(BUILD_SHARED_LIBS)
 ## = Packages =
 ## ============
 
+# Prepare header to build shared libs (windows)
 INCLUDE(GenerateExportHeader)
 
 # Find cpPlugins

diff --git a/appli/examples/example_Image_Dijkstra_EndPointDetection.cxx b/appli/examples/example_Image_Dijkstra_EndPointDetection.cxx
index aea0fe504f203100b5f04ab8123c5af82332133d..8a6dec2e57d04289b393daec50ddfc30cd6c9341 100644 (file)
--- a/appli/examples/example_Image_Dijkstra_EndPointDetection.cxx
+++ b/appli/examples/example_Image_Dijkstra_EndPointDetection.cxx
@@ -72,8 +72,7 @@ int main( int argc, char* argv[] )
     viewer.Start( );
 
   // Compute squared distance map
-  typename
-    itk::SignedMaurerDistanceMapImageFilter< TImage, TScalarImage >::Pointer
+  itk::SignedMaurerDistanceMapImageFilter< TImage, TScalarImage >::Pointer
     dmap =
     itk::SignedMaurerDistanceMapImageFilter< TImage, TScalarImage >::New( );
   dmap->SetInput( input_image );

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 0123559c2eeefa10444960a021c3755da00fc9ab..fc65c38466cfe1c9ff90f10952fcde845b4b1bba 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -4,4 +4,14 @@ CONFIGURE_FILE(
   @ONLY
   )
 
+## ========================
+## -- Installation rules --
+## ========================
+
+INSTALL(
+  FILES
+  ${PROJECT_BINARY_DIR}/FrontAlgorithmsConfig.cmake
+  DESTINATION share/cmake
+  )
+
 ## eof - $RCSfile$

diff --git a/cmake/FrontAlgorithmsConfig.cmake.in b/cmake/FrontAlgorithmsConfig.cmake.in
index da3d3e82c49033a80256660c7222e7cc81ec253b..c22d4ae264fa694e8bcd057802522f5631f61488 100644 (file)
--- a/cmake/FrontAlgorithmsConfig.cmake.in
+++ b/cmake/FrontAlgorithmsConfig.cmake.in
@@ -1,43 +1,35 @@
-FIND_PATH(
-  FrontAlgorithms_INCLUDE_DIR1
-  fpa/Base/Algorithm.h
-  PATHS
-  /usr/include
-  /usr/local/include
-  @PROJECT_SOURCE_DIR@/lib
-  @PROJECT_BINARY_DIR@/lib
-  @CMAKE_INSTALL_PREFIX@/include
-  )
+# =========================
+# -- Include directories --
+# =========================
 
-FIND_PATH(
-  FrontAlgorithms_INCLUDE_DIR2
-  fpa/FrontAlgorithms_Export.h
-  PATHS
-  /usr/include
-  /usr/local/include
+INCLUDE_DIRECTORIES(
   @PROJECT_SOURCE_DIR@/lib
   @PROJECT_BINARY_DIR@/lib
   @CMAKE_INSTALL_PREFIX@/include
   )
 
-INCLUDE_DIRECTORIES(
-  ${FrontAlgorithms_INCLUDE_DIR1}
-  ${FrontAlgorithms_INCLUDE_DIR2}
-  )
+# =========================
+# -- Library directories --
+# =========================
 
-FIND_LIBRARY(
-  FrontAlgorithms_LIBRARY_NAME
-  FrontAlgorithms
-  PATHS
-  /usr/lib
-  /usr/local/lib
-  @PROJECT_BINARY_DIR@
-  @CMAKE_INSTALL_PREFIX@/lib
-  )
+IF(MSVC)
+  LINK_DIRECTORIES(
+    @PROJECT_BINARY_DIR@/$(ConfigurationName)
+    @CMAKE_INSTALL_PREFIX@/bin
+    @CMAKE_INSTALL_PREFIX@/lib
+    )
+ELSE(MSVC)
+  LINK_DIRECTORIES(
+    @PROJECT_BINARY_DIR@
+    @CMAKE_INSTALL_PREFIX@/bin
+    @CMAKE_INSTALL_PREFIX@/lib
+    )
+ENDIF(MSVC)
 
-SET(
-  FrontAlgorithms_LIBRARIES
-  ${FrontAlgorithms_LIBRARY_NAME}
-  )
+# ===================
+# -- Library names --
+# ===================
+
+SET(FrontAlgorithms_LIBRARY FrontAlgorithms)
 
 ## eof - $RCSfile$

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 25544f558192122be693ae51efe4e6baeca6eae1..721d61fba076f82d94c3b01a3e54f7729ee92b2f 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -63,4 +63,48 @@ TARGET_LINK_LIBRARIES(
   ${${LIB_NAME}_LINK_LIBRARIES}
   )
 
+## ========================
+## -- Installation rules --
+## ========================
+
+INSTALL(
+  TARGETS ${LIB_NAME}
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib/static
+  )
+SET(
+  local_install_dirs
+  fpa
+  )
+FOREACH(dir ${local_install_dirs})
+  INSTALL(
+    DIRECTORY ${dir}
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.h"
+    )
+  INSTALL(
+    DIRECTORY ${dir}
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hxx"
+    )
+  INSTALL(
+    DIRECTORY ${dir}
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.hpp"
+    )
+ENDFOREACH(dir)
+
+INSTALL(
+  FILES
+  ${PROJECT_BINARY_DIR}/lib/fpa/${LIB_NAME}_Export.h
+  DESTINATION include/fpa
+  )
+
+IF(${USE_cpPlugins})
+  SUBDIRS(
+    fpaPlugins
+    )
+ENDIF(${USE_cpPlugins})
+
 ## eof - $RCSfile$

diff --git a/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h b/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h
index 3d7d5ac8b167ff413ead2f2ac13d18b6057d1e4c..1ac7c8f080c3acfc155f390a35f2d75720011945 100644 (file)
--- a/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h
+++ b/lib/fpa/Image/Functors/RegionGrowThresholdFunction.h
@@ -1,7 +1,7 @@
 #ifndef __FPA__IMAGE__FUNCTORS__REGIONGROWTHRESHOLDFUNCTION__H__
 #define __FPA__IMAGE__FUNCTORS__REGIONGROWTHRESHOLDFUNCTION__H__
 
-#include <limits>
+#include <itkNumericTraits.h>
 #include <fpa/Image/Functors/RegionGrowAllBelongsFunction.h>
 
 namespace fpa
@@ -59,8 +59,8 @@ namespace fpa
       protected:
         RegionGrowThresholdFunction( )
           : Superclass( ),
-            m_LowerThreshold( std::numeric_limits< TPixel >::min( ) ),
-            m_UpperThreshold( std::numeric_limits< TPixel >::max( ) )
+            m_LowerThreshold( itk::NumericTraits< TPixel >::min( ) ),
+            m_UpperThreshold( itk::NumericTraits< TPixel >::max( ) )
           { }
         virtual ~RegionGrowThresholdFunction( )
           { }

diff --git a/lib/fpaPlugins/CMakeLists.txt b/lib/fpaPlugins/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5b2d62f
--- /dev/null
+++ b/lib/fpaPlugins/CMakeLists.txt
@@ -0,0 +1,49 @@
+SET(LIBRARY_NAME fpaPlugins)
+
+## ===============
+## = Source code =
+## ===============
+
+FILE(GLOB LIB_HEADERS_H   "*.h")
+FILE(GLOB LIB_HEADERS_HPP "*.hpp")
+FILE(GLOB LIB_HEADERS_HXX "*.hxx")
+FILE(GLOB LIB_SOURCES_C   "*.c")
+FILE(GLOB LIB_SOURCES_CPP "*.cpp")
+FILE(GLOB LIB_SOURCES_CXX "*.cxx")
+
+## =====================
+## = Compilation rules =
+## =====================
+
+ADD_LIBRARY(
+  ${LIBRARY_NAME}
+  SHARED
+  ${LIB_SOURCES_C}
+  ${LIB_SOURCES_CPP}
+  ${LIB_SOURCES_CXX}
+  )
+GENERATE_EXPORT_HEADER(
+  ${LIBRARY_NAME}
+  BASE_NAME ${LIBRARY_NAME}
+  EXPORT_MACRO_NAME ${LIBRARY_NAME}_EXPORT
+  EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/lib/fpaPlugins/${LIBRARY_NAME}_Export.h
+  STATIC_DEFINE ${LIBRARY_NAME}_BUILT_AS_STATIC
+  )
+#TARGET_LINK_LIBRARIES(
+#  ${LIBRARY_NAME}
+#  cpExtensions
+#  cpPlugins_Interface
+#  )
+
+## ========================
+## -- Installation rules --
+## ========================
+
+#INSTALL(
+#  TARGETS ${LIBRARY_NAME}
+#  RUNTIME DESTINATION bin
+# LIBRARY DESTINATION lib
+#  ARCHIVE DESTINATION lib/static
+#  )
+
+## eof - $RCSfile$

diff --git a/lib/fpaPlugins/Host.cxx b/lib/fpaPlugins/Host.cxx
new file mode 100644 (file)
index 0000000..d264e45
--- /dev/null
+++ b/lib/fpaPlugins/Host.cxx
@@ -0,0 +1,34 @@
+#include <Pluma/Connector.hpp>
+/*
+  #include <cpPlugins/Plugins/ImageReader.h>
+  #include <cpPlugins/Plugins/ImageWriter.h>
+  #include <cpPlugins/Plugins/MeshReader.h>
+  #include <cpPlugins/Plugins/MeshWriter.h>
+  #include <cpPlugins/Plugins/MarchingCubes.h>
+  #include <cpPlugins/Plugins/OtsuThresholdImageFilter.h>
+  #include <cpPlugins/Plugins/RGBImageToOtherChannelsFilter.h>
+  #include <cpPlugins/Plugins/SecondRankDiffusionTensorToPolyData.h>
+  #include <cpPlugins/Plugins/BinaryThresholdImageFilter.h>
+*/
+
+/// TODO: doc
+PLUMA_CONNECTOR
+bool connect( pluma::Host& host )
+{
+  /*
+    using namespace cpPlugins::Plugins;
+
+    host.add( new ImageReaderProvider( ) );
+    host.add( new ImageWriterProvider( ) );
+    host.add( new MeshReaderProvider( ) );
+    host.add( new MeshWriterProvider( ) );
+    host.add( new MarchingCubesProvider( ) );
+    host.add( new OtsuThresholdImageFilterProvider( ) );
+    host.add( new RGBImageToOtherChannelsFilterProvider( ) );
+    host.add( new SecondRankDiffusionTensorToPolyDataProvider( ) );
+    host.add( new BinaryThresholdImageFilterProvider( ) );
+  */
+  return( true );
+}
+
+// eof - $RCSfile$