From bc09913a3a69da8cc3cbeb3eb796f166ef1025e2 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 11 Dec 2014 10:31:28 +0000
Subject: CMakeLists uniformization

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

Former-commit-id: b680aa0555385fb96c4e6217a15283daec0c4c50
---
 src/Contraction/example/CMakeLists.txt   |  5 +++--
 src/Contraction/test/CMakeLists.txt      |  4 ++--
 src/Contraction/test/TestContraction.cpp | 32 +++++++++++++++-----------------
 3 files changed, 20 insertions(+), 21 deletions(-)

(limited to 'src/Contraction')

diff --git a/src/Contraction/example/CMakeLists.txt b/src/Contraction/example/CMakeLists.txt
index 717830da..13eb5537 100644
--- a/src/Contraction/example/CMakeLists.txt
+++ b/src/Contraction/example/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(GUDHIskbl)
-add_executable ( RipsContraction Rips_contraction.cpp)
-target_link_libraries( RipsContraction ${Boost_TIMER_LIBRARY})	
 
+add_executable(RipsContraction Rips_contraction.cpp)
+target_link_libraries(RipsContraction ${Boost_TIMER_LIBRARY} ${Boost_SYSTEM_LIBRARY})	
 
+add_test(RipsContraction ${CMAKE_CURRENT_BINARY_DIR}/RipsContraction ${CMAKE_SOURCE_DIR}/data/meshes/sphere3D_2646.off 0.2)
diff --git a/src/Contraction/test/CMakeLists.txt b/src/Contraction/test/CMakeLists.txt
index 049b4ea1..b52c4862 100644
--- a/src/Contraction/test/CMakeLists.txt
+++ b/src/Contraction/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 project(GUDHIskbl)
 
-add_executable ( TestContraction            TestContraction.cpp )
-
+add_executable(TestContraction TestContraction.cpp)
 
+add_test(TestContraction ${CMAKE_CURRENT_BINARY_DIR}/TestContraction ${CMAKE_SOURCE_DIR}/data/meshes/SO3_50000.off 0.2)
diff --git a/src/Contraction/test/TestContraction.cpp b/src/Contraction/test/TestContraction.cpp
index f0604396..1090c054 100644
--- a/src/Contraction/test/TestContraction.cpp
+++ b/src/Contraction/test/TestContraction.cpp
@@ -7,27 +7,25 @@
 #include <ctime>
 #include <list>
 
-#include "combinatorics/Skeleton_blocker/Skeleton_blocker_simple_traits.h"
-#include "geometry/Skeleton_blocker_simple_geometric_traits.h"
+#include "gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h"
+#include "gudhi/Skeleton_blocker/Skeleton_blocker_simple_geometric_traits.h"
 //#include "Skeleton_blocker/Simplex.h"
-#include "contraction/Skeleton_blocker_contractor.h"
-#include "Utils.h"
-#include "iofile.h"
-#include "Test.h"
-#include "Skeleton_blocker_geometric_complex.h"
+#include "gudhi/Skeleton_blocker_contractor.h"
+#include "gudhi/Utils.h"
+#include "gudhi/iofile.h"
+#include "gudhi/Test.h"
+#include "gudhi/Skeleton_blocker_geometric_complex.h"
 //#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 
-#include "contraction/Edge_profile.h"
-
-#include "contraction/policies/Cost_policy.h"
-#include "contraction/policies/Edge_length_cost.h"
-#include "contraction/policies/Placement_policy.h"
-#include "contraction/policies/Middle_placement.h"
-
-#include "contraction/policies/Valid_contraction_policy.h"
-#include "contraction/policies/Dummy_valid_contraction.h"
-#include "contraction/policies/Link_condition_valid_contraction.h"
+#include "gudhi/Contraction/Edge_profile.h"
+#include "gudhi/Contraction/policies/Cost_policy.h"
+#include "gudhi/Contraction/policies/Edge_length_cost.h"
+#include "gudhi/Contraction/policies/Placement_policy.h"
+#include "gudhi/Contraction/policies/Middle_placement.h"
+#include "gudhi/Contraction/policies/Valid_contraction_policy.h"
+#include "gudhi/Contraction/policies/Dummy_valid_contraction.h"
+#include "gudhi/Contraction/policies/Link_condition_valid_contraction.h"
 
 
 using namespace std;
-- 
cgit v1.2.3