From: Leonardo Florez-Valencia Date: Tue, 5 Apr 2016 22:40:31 +0000 (-0500) Subject: ... X-Git-Tag: v0.1~206 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a645bdc9f56480d4951ffbb5cba4804d25cb9107;p=cpPlugins.git ... --- diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in index 01ac83c..b467890 100644 --- a/cmake/cpPluginsConfig.cmake.in +++ b/cmake/cpPluginsConfig.cmake.in @@ -92,6 +92,7 @@ ENDIF(MSVC) SET(cpExtensions_LIBRARY cpExtensions) SET(cpPlugins_tinyxml2_LIBRARY cpPlugins_tinyxml2) +SET(cpPlugins_ALL_INSTANCES_LIBRARIES "@cpPlugins_ALL_INSTANCES@") SET(cpPlugins_LIBRARY cpPlugins) SET(cpPipelineEditor_LIBRARY cpPipelineEditor) diff --git a/lib/cpPlugins/CMakeLists.txt b/lib/cpPlugins/CMakeLists.txt index 5516a22..971707f 100644 --- a/lib/cpPlugins/CMakeLists.txt +++ b/lib/cpPlugins/CMakeLists.txt @@ -83,20 +83,8 @@ SET( SET( target_LIBRARIES - cpPlugins_Base - cpPlugins_DistanceMapFilters - cpPlugins_GaussianImageFilters - cpPlugins_ImageFiltersBase - cpPlugins_ImageIO - cpPlugins_ImageIterators - cpPlugins_ImageITK2VTK - cpPlugins_Image - cpPlugins_InPlaceImageFiltersBase - cpPlugins_Mesh - cpPlugins_ResamplingFilters - cpPlugins_ThresholdFilters + ${cpPlugins_ALL_INSTANCES} cpPlugins_tinyxml2 - cpPlugins_Transforms ) IF(NOT WIN32) SET( diff --git a/lib/cpPlugins_Instances/Base_extra.cxx b/lib/cpPlugins_Instances/Base_extra.cxx index e0d8a83..e0b7234 100644 --- a/lib/cpPlugins_Instances/Base_extra.cxx +++ b/lib/cpPlugins_Instances/Base_extra.cxx @@ -46,15 +46,18 @@ cpPlugins_Base_extra_Array_AllScalars_AllDims( itk::FixedArray ); cpPlugins_Base_extra_Array_AllScalars_AllDims( itk::Point ); cpPlugins_Base_extra_Array_AllScalars_AllDims( itk::Vector ); -#define cpPlugins_Base_extra_VariableLengthVector_SetSize( T, P ) \ - template cpPlugins_Base_EXPORT void itk::VariableLengthVector< T >:: \ - SetSize< itk::VariableLengthVector< T >::P, \ - itk::VariableLengthVector< T >::KeepOldValues >( \ - unsigned int, itk::VariableLengthVector< T >::P, \ - itk::VariableLengthVector< float >::KeepOldValues \ - ) - -cpPlugins_Base_extra_VariableLengthVector_SetSize( float, AlwaysReallocate ); -cpPlugins_Base_extra_VariableLengthVector_SetSize( float, ShrinkToFit ); +// ------------------------------------------------------------------------- +#define cpPlugins_Base_extra_VariableLengthVector_SetSize( T, P, Q ) \ + template cpPlugins_Base_EXPORT void itk::VariableLengthVector< T >:: \ + SetSize \ + < itk::VariableLengthVector< T >::P, itk::VariableLengthVector< T >::Q > \ + ( \ + unsigned int, \ + itk::VariableLengthVector< T >::P, \ + itk::VariableLengthVector< T >::Q \ + ) + +cpPlugins_Base_extra_VariableLengthVector_SetSize( float, AlwaysReallocate, KeepOldValues ); +cpPlugins_Base_extra_VariableLengthVector_SetSize( float, ShrinkToFit, KeepOldValues ); // eof - $RCSfile$ diff --git a/lib/cpPlugins_Instances/CMakeLists.txt b/lib/cpPlugins_Instances/CMakeLists.txt index bd6ff33..2bbc988 100644 --- a/lib/cpPlugins_Instances/CMakeLists.txt +++ b/lib/cpPlugins_Instances/CMakeLists.txt @@ -4,6 +4,7 @@ FILE( "${CMAKE_CURRENT_SOURCE_DIR}/*.i" ) +SET(aux_ALL_INSTANCES) FOREACH(i ${libs_DEFS}) GET_FILENAME_COMPONENT(l_DEF ${i} NAME_WE) SET(i_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${l_DEF}.i") @@ -11,6 +12,7 @@ FOREACH(i ${libs_DEFS}) SET(s_FILE "${CMAKE_CURRENT_BINARY_DIR}/${l_DEF}.cxx") SET(o_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${l_DEF}_extra.cxx") SET(l_NAME "cpPlugins_${l_DEF}") + SET(aux_ALL_INSTANCES ${aux_ALL_INSTANCES} ${l_NAME}) ADD_CUSTOM_COMMAND( OUTPUT ${h_FILE} ${s_FILE} DEPENDS cpPlugins_CreateInstances ${i_FILE} @@ -35,6 +37,12 @@ FOREACH(i ${libs_DEFS}) ) ENDFOREACH(i) +SET( + cpPlugins_ALL_INSTANCES + ${aux_ALL_INSTANCES} + CACHE STRING "All instances libraries." + ) + ## Target links TARGET_LINK_LIBRARIES(cpPlugins_Base ${ITK_LIBRARIES}) TARGET_LINK_LIBRARIES(cpPlugins_Transforms ${ITK_LIBRARIES} cpPlugins_Base)