X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FCMakeLists.txt;h=1ac13cdc643039f224668c2545b52b4f9cb39593;hb=34f4ff5d31c70f1127d43865c61e9f57a7071190;hp=bb03dddedd255efc89d27061c411d7a853db9bd2;hpb=e977d1bb57ca61759a1fb1a1d0d8937718ef8722;p=FrontAlgorithms.git

diff --git a/lib/fpa/CMakeLists.txt b/lib/fpa/CMakeLists.txt
index bb03ddd..1ac13cd 100644
--- a/lib/fpa/CMakeLists.txt
+++ b/lib/fpa/CMakeLists.txt
@@ -5,20 +5,21 @@
 
 configure_file(Version.cxx.in "${CMAKE_CURRENT_BINARY_DIR}/Version.cxx" @ONLY)
 configure_file(Config.h.in "${CMAKE_CURRENT_BINARY_DIR}/Config.h" @ONLY)
-file(GLOB_RECURSE _common_src "${CMAKE_CURRENT_SOURCE_DIR}/Common/*.cxx")
-file(GLOB_RECURSE _filters_src "${CMAKE_CURRENT_SOURCE_DIR}/Filters/*.cxx")
-file(GLOB_RECURSE _functors_src "${CMAKE_CURRENT_SOURCE_DIR}/Functors/*.cxx")
-file(GLOB_RECURSE _common_hdr "${CMAKE_CURRENT_SOURCE_DIR}/Common/*.h")
-file(GLOB_RECURSE _filters_hdr "${CMAKE_CURRENT_SOURCE_DIR}/Filters/*.h")
-file(GLOB_RECURSE _functors_hdr "${CMAKE_CURRENT_SOURCE_DIR}/Functors/*.h")
-file(GLOB_RECURSE _common_hrc "${CMAKE_CURRENT_SOURCE_DIR}/Common/*.hxx")
-file(GLOB_RECURSE _filters_hrc "${CMAKE_CURRENT_SOURCE_DIR}/Filters/*.hxx")
-file(GLOB_RECURSE _functors_hrc "${CMAKE_CURRENT_SOURCE_DIR}/Functors/*.hxx")
+set(_dirs Common DataStructures Filters Functors)
 if(VTK_FOUND)
-  file(GLOB_RECURSE _vtk_src "${CMAKE_CURRENT_SOURCE_DIR}/VTK/*.cxx")
-  file(GLOB_RECURSE _vtk_hdr "${CMAKE_CURRENT_SOURCE_DIR}/VTK/*.h")
-  file(GLOB_RECURSE _vtk_hrc "${CMAKE_CURRENT_SOURCE_DIR}/VTK/*.hxx")
+  list(APPEND _dirs VTK)
 endif(VTK_FOUND)
+set(_src)
+set(_hdr)
+set(_hrc)
+foreach(_d ${_dirs})
+  file(GLOB_RECURSE _s "${CMAKE_CURRENT_SOURCE_DIR}/${_d}/*.cxx")
+  file(GLOB_RECURSE _h "${CMAKE_CURRENT_SOURCE_DIR}/${_d}/*.h")
+  file(GLOB_RECURSE _t "${CMAKE_CURRENT_SOURCE_DIR}/${_d}/*.hxx")
+  list(APPEND _src ${_s})
+  list(APPEND _hdr ${_h})
+  list(APPEND _hrc ${_t})
+endforeach(_d)
 
 ## =====================
 ## == Compile library ==
@@ -28,10 +29,7 @@ add_library(
   fpa SHARED
   "${CMAKE_CURRENT_BINARY_DIR}/Version.cxx"
   "${CMAKE_CURRENT_BINARY_DIR}/Config.h"
-  ${_common_src}
-  ${_filters_src}
-  ${_functors_src}
-  ${_vtk_src}
+  ${_src} ${_hdr} ${_hrc}
   )
 generate_export_header(fpa)
 set_property(TARGET fpa PROPERTY VERSION ${prj_VERSION})
@@ -42,7 +40,7 @@ set_property(
 set_property(
   TARGET fpa APPEND PROPERTY COMPATIBLE_INTERFACE_STRING ${prj_MAJ_VERSION}
   )
-target_link_libraries(fpa PUBLIC ${ITK_LIBRARIES})
+target_link_libraries(fpa PUBLIC ${ITK_LIBRARIES} ${VTK_LIBRARIES})
 
 ## ========================
 ## == Installation rules ==