Trying move + corrections in one shot

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})

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 {
 

vlsisapd/src/cif/CifPolygon.cpp

@@ -3,7 +3,7 @@
 #include <ctime>
 using namespace std;
 
-#include "CifPolygon.h"
+#include "vlsisapd/cif/CifPolygon.h"
 
 namespace vlsisapd {