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

diff --git a/lib/fpa/CMakeLists.txt b/lib/fpa/CMakeLists.txt
index 264f589..1ac13cd 100644
--- a/lib/fpa/CMakeLists.txt
+++ b/lib/fpa/CMakeLists.txt
@@ -1,33 +1,36 @@
-
-## =====================
-## == Get source code ==
-## =====================
+## =========================================================================
+## @author Leonardo Florez Valencia
+## @email florez-l@javeriana.edu.co
+## =========================================================================
 
 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 _base_src "${CMAKE_CURRENT_SOURCE_DIR}/Base/*.cxx")
-file(GLOB_RECURSE _base_hdr "${CMAKE_CURRENT_SOURCE_DIR}/Base/*.h")
-file(GLOB_RECURSE _base_hrc "${CMAKE_CURRENT_SOURCE_DIR}/Base/*.hxx")
-file(GLOB_RECURSE _image_src "${CMAKE_CURRENT_SOURCE_DIR}/Image/*.cxx")
-file(GLOB_RECURSE _image_hdr "${CMAKE_CURRENT_SOURCE_DIR}/Image/*.h")
-file(GLOB_RECURSE _image_hrc "${CMAKE_CURRENT_SOURCE_DIR}/Image/*.hxx")
-
-set(_src
-  ${_base_src} ${_image_src}
-  "${CMAKE_CURRENT_BINARY_DIR}/Version.cxx"
-  )
-set(
-  _hdr
-  ${_base_hdr} ${_image_hdr}
-  "${CMAKE_CURRENT_BINARY_DIR}/Config.h"
-  )
-set(_hrc ${_base_hrc} ${_image_hrc})
+set(_dirs Common DataStructures Filters Functors)
+if(VTK_FOUND)
+  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 ==
 ## =====================
 
-add_library(fpa SHARED ${_src} ${_hdr} ${_hrc})
+add_library(
+  fpa SHARED
+  "${CMAKE_CURRENT_BINARY_DIR}/Version.cxx"
+  "${CMAKE_CURRENT_BINARY_DIR}/Config.h"
+  ${_src} ${_hdr} ${_hrc}
+  )
 generate_export_header(fpa)
 set_property(TARGET fpa PROPERTY VERSION ${prj_VERSION})
 set_property(TARGET fpa PROPERTY SOVERSION ${prj_SHORT_VERSION})
@@ -37,7 +40,7 @@ set_property(
 set_property(
   TARGET fpa APPEND PROPERTY COMPATIBLE_INTERFACE_STRING ${prj_MAJ_VERSION}
   )
-target_link_libraries(fpa PUBLIC ${VTK_LIBRARIES} ${ITK_LIBRARIES})
+target_link_libraries(fpa PUBLIC ${ITK_LIBRARIES} ${VTK_LIBRARIES})
 
 ## ========================
 ## == Installation rules ==
@@ -65,5 +68,9 @@ install(
   FILES "${CMAKE_CURRENT_BINARY_DIR}/fpa_export.h"
   DESTINATION "${include_install_dir}/fpa"
   )
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/Config.h"
+  DESTINATION "${include_install_dir}/fpa"
+  )
 
 ## eof - $RCSfile$