Make build out of source

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representation_integration@2513 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 7b6b18858d5e71613c4c15c4c262b4c4b5a6ac8e

1 files changed, 20 insertions, 9 deletions

diff --git a/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt b/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt
index f1ef144b..55a4fd50 100644
--- a/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt
+++ b/src/Persistence_representations/utilities/persistence_landscapes_on_grid/CMakeLists.txt
@@ -1,27 +1,38 @@
 cmake_minimum_required(VERSION 2.6)
-project(GUDHI_STAT)
+project(Persistence_representations_lanscapes_on_grid_utilities)
 
+file(COPY "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-
-
-#persitence landscapes on a grid
 add_executable ( create_landscapes_on_grid create_landscapes_on_grid.cpp )
 target_link_libraries(create_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_test ( create_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/create_landscapes_on_grid 100 -1 -1 -1 "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt" )
+
+# Will create simple_diagram.txt.land
+add_test(NAME create_landscapes_on_grid COMMAND $<TARGET_FILE:create_landscapes_on_grid>
+    "100" "-1" "-1" "-1" "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt")
 
 add_executable ( average_landscapes_on_grid average_landscapes_on_grid.cpp )
 target_link_libraries(average_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_test ( average_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/average_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" )
+
+add_test(NAME average_landscapes_on_grid COMMAND $<TARGET_FILE:average_landscapes_on_grid>
+    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land"
+    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land")
 
 add_executable ( plot_landscapes_on_grid plot_landscapes_on_grid.cpp )
 target_link_libraries(plot_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_test ( plot_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/plot_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" )
+
+add_test(NAME plot_landscapes_on_grid COMMAND $<TARGET_FILE:plot_landscapes_on_grid>
+    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land")
 
 add_executable ( compute_distance_of_landscapes_on_grid compute_distance_of_landscapes_on_grid.cpp )
 target_link_libraries(compute_distance_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_test ( compute_distance_of_landscapes_on_grids ${CMAKE_CURRENT_BINARY_DIR}/compute_distance_of_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" )
+
+add_test(NAME compute_distance_of_landscapes_on_grid COMMAND $<TARGET_FILE:compute_distance_of_landscapes_on_grid>
+    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land"
+    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land")
 
 add_executable ( compute_scalar_product_of_landscapes_on_grid compute_scalar_product_of_landscapes_on_grid.cpp )
 target_link_libraries(compute_scalar_product_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY})
-add_test ( compute_scalar_product_of_landscapes_on_grid ${CMAKE_CURRENT_BINARY_DIR}/compute_scalar_product_of_landscapes_on_grid "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" "${CMAKE_SOURCE_DIR}/data/persistence_diagram/simple_diagram.txt.g_land" )	
 
+add_test(NAME compute_scalar_product_of_landscapes_on_grid COMMAND $<TARGET_FILE:compute_scalar_product_of_landscapes_on_grid>
+    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land"
+    "${CMAKE_CURRENT_BINARY_DIR}/simple_diagram.txt.g_land")