From c89ee9f1ca15747c3f9208e72d14e938fe52db1d Mon Sep 17 00:00:00 2001 From: Damien Dupuis Date: Thu, 3 Jun 2010 13:59:49 +0000 Subject: [PATCH] Code modifications to adapt to include files moving --- vlsisapd/src/agds/CMakeLists.txt | 11 +++++++++-- vlsisapd/src/agds/GdsLibrary.cpp | 2 +- vlsisapd/src/agds/GdsRectangle.cpp | 2 +- vlsisapd/src/agds/GdsStructure.cpp | 2 +- vlsisapd/src/agds/vlsisapd/agds/GdsLibrary.h | 2 +- vlsisapd/src/agds/vlsisapd/agds/GdsRectangle.h | 2 +- vlsisapd/src/agds/vlsisapd/agds/GdsStructure.h | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/vlsisapd/src/agds/CMakeLists.txt b/vlsisapd/src/agds/CMakeLists.txt index 4a6a9323..bfbcabc0 100644 --- a/vlsisapd/src/agds/CMakeLists.txt +++ b/vlsisapd/src/agds/CMakeLists.txt @@ -1,7 +1,14 @@ INCLUDE_DIRECTORIES(${CHAMS_SOURCE_DIR}/agds) -SET ( includes GdsLibrary.h GdsStructure.h GdsElement.h GdsRectangle.h ) -SET ( cpps GdsLibrary.cpp GdsStructure.cpp GdsRectangle.cpp ) +SET ( includes vlsisapd/agds/GdsLibrary.h + vlsisapd/agds/GdsStructure.h + vlsisapd/agds/GdsElement.h + vlsisapd/agds/GdsRectangle.h + ) +SET ( cpps GdsLibrary.cpp + GdsStructure.cpp + GdsRectangle.cpp + ) ADD_LIBRARY(agds ${cpps}) INSTALL(TARGETS agds DESTINATION lib${LIB_SUFFIX}) diff --git a/vlsisapd/src/agds/GdsLibrary.cpp b/vlsisapd/src/agds/GdsLibrary.cpp index 5908ad53..62c6d5dd 100644 --- a/vlsisapd/src/agds/GdsLibrary.cpp +++ b/vlsisapd/src/agds/GdsLibrary.cpp @@ -3,7 +3,7 @@ #include using namespace std; -#include "GdsLibrary.h" +#include "vlsisapd/agds/GdsLibrary.h" namespace vlsisapd { diff --git a/vlsisapd/src/agds/GdsRectangle.cpp b/vlsisapd/src/agds/GdsRectangle.cpp index 6f371b0c..673df17e 100644 --- a/vlsisapd/src/agds/GdsRectangle.cpp +++ b/vlsisapd/src/agds/GdsRectangle.cpp @@ -2,7 +2,7 @@ #include using namespace std; -#include "GdsRectangle.h" +#include "vlsisapd/agds/GdsRectangle.h" namespace vlsisapd { GdsElement::~GdsElement () { } diff --git a/vlsisapd/src/agds/GdsStructure.cpp b/vlsisapd/src/agds/GdsStructure.cpp index 16e1c6b9..34f13688 100644 --- a/vlsisapd/src/agds/GdsStructure.cpp +++ b/vlsisapd/src/agds/GdsStructure.cpp @@ -2,7 +2,7 @@ #include using namespace std; -#include "GdsStructure.h" +#include "vlsisapd/agds/GdsStructure.h" namespace vlsisapd { GdsStructure::GdsStructure(string strName) diff --git a/vlsisapd/src/agds/vlsisapd/agds/GdsLibrary.h b/vlsisapd/src/agds/vlsisapd/agds/GdsLibrary.h index 51d491da..d02a94f8 100644 --- a/vlsisapd/src/agds/vlsisapd/agds/GdsLibrary.h +++ b/vlsisapd/src/agds/vlsisapd/agds/GdsLibrary.h @@ -4,7 +4,7 @@ #include using namespace std; -#include "GdsStructure.h" +#include "vlsisapd/agds/GdsStructure.h" namespace vlsisapd { class GdsLibrary { diff --git a/vlsisapd/src/agds/vlsisapd/agds/GdsRectangle.h b/vlsisapd/src/agds/vlsisapd/agds/GdsRectangle.h index c656aaea..2758e772 100644 --- a/vlsisapd/src/agds/vlsisapd/agds/GdsRectangle.h +++ b/vlsisapd/src/agds/vlsisapd/agds/GdsRectangle.h @@ -3,7 +3,7 @@ #include -#include "GdsElement.h" +#include "vlsisapd/agds/GdsElement.h" namespace vlsisapd { class GdsRectangle : public GdsElement { diff --git a/vlsisapd/src/agds/vlsisapd/agds/GdsStructure.h b/vlsisapd/src/agds/vlsisapd/agds/GdsStructure.h index 70c0d1bc..ed6fd6b2 100644 --- a/vlsisapd/src/agds/vlsisapd/agds/GdsStructure.h +++ b/vlsisapd/src/agds/vlsisapd/agds/GdsStructure.h @@ -6,7 +6,7 @@ #include using namespace std; -#include "GdsElement.h" +#include "vlsisapd/agds/GdsElement.h" namespace vlsisapd { class GdsStructure {