From 638e7dd058fe0323173805c5c25a0eec2be971a9 Mon Sep 17 00:00:00 2001
From: Damien Dupuis <alliance-users@asim.lip6.fr>
Date: Thu, 3 Jun 2010 14:06:42 +0000
Subject: [PATCH]     Trying move + corrections in one shot

---
 vlsisapd/src/cif/CMakeLists.txt                 | 10 +++++++---
 vlsisapd/src/cif/CifCircuit.cpp                 |  4 ++--
 vlsisapd/src/cif/CifPolygon.cpp                 |  2 +-
 vlsisapd/src/cif/{ => vlsisap/cif}/CifCircuit.h |  0
 vlsisapd/src/cif/{ => vlsisap/cif}/CifPolygon.h |  0
 5 files changed, 10 insertions(+), 6 deletions(-)
 rename vlsisapd/src/cif/{ => vlsisap/cif}/CifCircuit.h (100%)
 rename vlsisapd/src/cif/{ => vlsisap/cif}/CifPolygon.h (100%)

diff --git a/vlsisapd/src/cif/CMakeLists.txt b/vlsisapd/src/cif/CMakeLists.txt
index 0b6489ef..2036db6a 100644
--- a/vlsisapd/src/cif/CMakeLists.txt
+++ b/vlsisapd/src/cif/CMakeLists.txt
@@ -1,7 +1,11 @@
-INCLUDE_DIRECTORIES(${CHAMS_SOURCE_DIR}/cif)
+INCLUDE_DIRECTORIES(${CHAMS_SOURCE_DIR}/src/cif)
 
-SET ( includes CifCircuit.h   CifPolygon.h )
-SET ( cpps     CifCircuit.cpp CifPolygon.cpp )
+SET ( includes vlsisapd/cif/CifCircuit.h   
+               vlsisapd/cif/CifPolygon.h
+    )
+SET ( cpps CifCircuit.cpp 
+           CifPolygon.cpp 
+    )
 
 ADD_LIBRARY(cif ${cpps})
 INSTALL(TARGETS cif DESTINATION lib${LIB_SUFFIX})
diff --git a/vlsisapd/src/cif/CifCircuit.cpp b/vlsisapd/src/cif/CifCircuit.cpp
index 0024edfb..7789c8e9 100644
--- a/vlsisapd/src/cif/CifCircuit.cpp
+++ b/vlsisapd/src/cif/CifCircuit.cpp
@@ -3,8 +3,8 @@
 #include <ctime>
 using namespace std;
 
-#include "CifCircuit.h"
-#include "CifPolygon.h"
+#include "vlsisapd/cif/CifCircuit.h"
+#include "vlsisapd/cif/CifPolygon.h"
 
 namespace vlsisapd {
 
diff --git a/vlsisapd/src/cif/CifPolygon.cpp b/vlsisapd/src/cif/CifPolygon.cpp
index 8fc63e1c..815b6c76 100644
--- a/vlsisapd/src/cif/CifPolygon.cpp
+++ b/vlsisapd/src/cif/CifPolygon.cpp
@@ -3,7 +3,7 @@
 #include <ctime>
 using namespace std;
 
-#include "CifPolygon.h"
+#include "vlsisapd/cif/CifPolygon.h"
 
 namespace vlsisapd {
 
diff --git a/vlsisapd/src/cif/CifCircuit.h b/vlsisapd/src/cif/vlsisap/cif/CifCircuit.h
similarity index 100%
rename from vlsisapd/src/cif/CifCircuit.h
rename to vlsisapd/src/cif/vlsisap/cif/CifCircuit.h
diff --git a/vlsisapd/src/cif/CifPolygon.h b/vlsisapd/src/cif/vlsisap/cif/CifPolygon.h
similarity index 100%
rename from vlsisapd/src/cif/CifPolygon.h
rename to vlsisapd/src/cif/vlsisap/cif/CifPolygon.h