diff --git a/vlsisapd/src/bookshelf/src/CMakeLists.txt b/vlsisapd/src/bookshelf/src/CMakeLists.txt index 70bcccf8..bb66684d 100644 --- a/vlsisapd/src/bookshelf/src/CMakeLists.txt +++ b/vlsisapd/src/bookshelf/src/CMakeLists.txt @@ -1,34 +1,32 @@ - # to work on sl5 64 bits : need to suppress boost_python in Boost_LIBRARIES - set(Boost_LIBRARIES "") - setup_boost(program_options filesystem regex) include_directories ( ${VLSISAPD_SOURCE_DIR}/src/bookshelf/src ${Boost_INCLUDE_DIRS} + ${PYTHON_INCLUDE_PATH} ) - set ( includes vlsisapd/bookshelf/Parser.h + set ( includes vlsisapd/bookshelf/Parser.h vlsisapd/bookshelf/Node.h vlsisapd/bookshelf/Pin.h vlsisapd/bookshelf/Net.h vlsisapd/bookshelf/Row.h vlsisapd/bookshelf/Circuit.h vlsisapd/bookshelf/Exception.h - ) - set ( cpps Parser.cpp + ) + set ( cpps Parser.cpp Node.cpp Pin.cpp Net.cpp Row.cpp Circuit.cpp Exception.cpp - ) + ) set ( testcpps BookshelfTkMain.cpp ) add_library ( bookshelf ${cpps} ) target_link_libraries ( bookshelf ${Boost_LIBRARIES} ) set_target_properties ( bookshelf PROPERTIES VERSION 1.0 SOVERSION 1 ) add_executable ( bookshelf-tk ${testcpps} ) - target_link_libraries ( bookshelf-tk bookshelf ${Boost_LIBRARIES} ) + target_link_libraries ( bookshelf-tk bookshelf ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) install ( TARGETS bookshelf DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS bookshelf-tk DESTINATION bin ) diff --git a/vlsisapd/src/configuration/src/CMakeLists.txt b/vlsisapd/src/configuration/src/CMakeLists.txt index 021ead89..856f9bca 100644 --- a/vlsisapd/src/configuration/src/CMakeLists.txt +++ b/vlsisapd/src/configuration/src/CMakeLists.txt @@ -1,7 +1,4 @@ - # to work on sl5 64 bits : need to suppress boost_python in Boost_LIBRARIES - set(Boost_LIBRARIES "") - setup_boost(program_options filesystem regex) include ( ${QT_USE_FILE} ) include_directories ( ${VLSISAPD_SOURCE_DIR}/src/configuration/src diff --git a/vlsisapd/src/dtr/src/vlsisapd/dtr/Rules.h b/vlsisapd/src/dtr/src/vlsisapd/dtr/Rules.h index f8260e64..1356a327 100644 --- a/vlsisapd/src/dtr/src/vlsisapd/dtr/Rules.h +++ b/vlsisapd/src/dtr/src/vlsisapd/dtr/Rules.h @@ -27,6 +27,8 @@ class Rule { public: Rule(Name name, double value, Name ref, Name layer1, Name layer2) : _name(name), _type(Name("")), _value(value), _valueStr(to_string(value)), _ref(ref), _layer1(layer1), _layer2(layer2) {}; + + virtual ~Rule() {} // accessors inline Name getName(); @@ -57,6 +59,8 @@ class ARule : public Rule { public: ARule(Name name, double value, Name ref, Name layer1, Name layer2) : Rule(name, value, ref, layer1, layer2) {}; + + virtual ~ARule() {} }; inline Name Rule::getName() { return _name; };