Code modifications to adapt to include files moving

This commit is contained in:
Damien Dupuis 2010-06-03 13:59:49 +00:00
parent 9de4bf0cc9
commit c89ee9f1ca
7 changed files with 15 additions and 8 deletions

View File

@ -1,7 +1,14 @@
INCLUDE_DIRECTORIES(${CHAMS_SOURCE_DIR}/agds) INCLUDE_DIRECTORIES(${CHAMS_SOURCE_DIR}/agds)
SET ( includes GdsLibrary.h GdsStructure.h GdsElement.h GdsRectangle.h ) SET ( includes vlsisapd/agds/GdsLibrary.h
SET ( cpps GdsLibrary.cpp GdsStructure.cpp GdsRectangle.cpp ) vlsisapd/agds/GdsStructure.h
vlsisapd/agds/GdsElement.h
vlsisapd/agds/GdsRectangle.h
)
SET ( cpps GdsLibrary.cpp
GdsStructure.cpp
GdsRectangle.cpp
)
ADD_LIBRARY(agds ${cpps}) ADD_LIBRARY(agds ${cpps})
INSTALL(TARGETS agds DESTINATION lib${LIB_SUFFIX}) INSTALL(TARGETS agds DESTINATION lib${LIB_SUFFIX})

View File

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

View File

@ -2,7 +2,7 @@
#include <iomanip> #include <iomanip>
using namespace std; using namespace std;
#include "GdsRectangle.h" #include "vlsisapd/agds/GdsRectangle.h"
namespace vlsisapd { namespace vlsisapd {
GdsElement::~GdsElement () { } GdsElement::~GdsElement () { }

View File

@ -2,7 +2,7 @@
#include <ctime> #include <ctime>
using namespace std; using namespace std;
#include "GdsStructure.h" #include "vlsisapd/agds/GdsStructure.h"
namespace vlsisapd { namespace vlsisapd {
GdsStructure::GdsStructure(string strName) GdsStructure::GdsStructure(string strName)

View File

@ -4,7 +4,7 @@
#include <vector> #include <vector>
using namespace std; using namespace std;
#include "GdsStructure.h" #include "vlsisapd/agds/GdsStructure.h"
namespace vlsisapd { namespace vlsisapd {
class GdsLibrary { class GdsLibrary {

View File

@ -3,7 +3,7 @@
#include <fstream> #include <fstream>
#include "GdsElement.h" #include "vlsisapd/agds/GdsElement.h"
namespace vlsisapd { namespace vlsisapd {
class GdsRectangle : public GdsElement { class GdsRectangle : public GdsElement {

View File

@ -6,7 +6,7 @@
#include <vector> #include <vector>
using namespace std; using namespace std;
#include "GdsElement.h" #include "vlsisapd/agds/GdsElement.h"
namespace vlsisapd { namespace vlsisapd {
class GdsStructure { class GdsStructure {