riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor changes for compatibility with Mac osx 10.6 

- moving Script from isobar to viewer
    - adding missing target_link_libraries
    - adding boost::filesystem component dependency
This commit is contained in:
Damien Dupuis 2010-07-15 11:13:24 +00:00
parent 21e0040b3b
commit b2e2eafadb
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hurricane/src/isobar/CMakeLists.txt
View File

@ -84,19 +84,16 @@
hurricane/isobar/PyUpdateSession.h
hurricane/isobar/PyVertical.h
)
# source2 & include2 for module that are *not* Python wrappers but true
# Hurricane modules.
set ( sources2 Script.cpp )
set ( includes2 hurricane/isobar/Script.h )
install ( FILES ${includes}
${includes2} DESTINATION include/coriolis2/hurricane/isobar )
add_library ( isobar ${sources} ${sources2} )
add_library ( isobar ${sources} )
target_link_libraries ( isobar hurricane ${PYTHON_LIBRARIES})
add_library ( Hurricane MODULE ${sources} )
set_target_properties ( Hurricane PROPERTIES
COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
PREFIX ""
)
target_link_libraries ( Hurricane isobar )
install ( TARGETS isobar DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS Hurricane DESTINATION ${PYTHON_SITE_PACKAGES} )
install ( FILES ${includes} DESTINATION include/coriolis2/hurricane/isobar )

18
hurricane/src/viewer/CMakeLists.txt
View File

@ -98,22 +98,28 @@
set ( pycpps PyViewer.cpp
PyCellViewer.cpp
)
# source2 & include2 for module that are *not* Python wrappers but true
# Hurricane modules.
set ( sources2 Script.cpp )
set ( includes2 hurricane/viewer/Script.h )
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
qt4_add_resources ( RCC_SRCS CellViewer.qrc )
add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${pycpps} )
target_link_libraries ( viewer hurricane ${QT_LIBRARIES} ${Boost_LIBRARIES} )
add_library ( Viewer MODULE ${pycpps} )
target_link_libraries ( Viewer viewer )
set_target_properties ( Viewer PROPERTIES
add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ${sources2} ${pycpps} )
target_link_libraries ( viewer hurricane isobar ${CONFIGURATION_LIBRARY} ${Boost_LIBRARIES} ${QT_LIBRARIES} )
add_library ( pyViewer MODULE ${pycpps} )
target_link_libraries ( pyViewer viewer )
set_target_properties ( pyViewer PROPERTIES
COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1"
OUTPUT_NAME "Viewer"
PREFIX ""
)
install ( FILES ${includes}
${includes2}
${mocincludes}
${pyincludes} DESTINATION include/coriolis2/hurricane/viewer )
install ( TARGETS viewer DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS Viewer DESTINATION ${PYTHON_SITE_PACKAGES} )
install ( TARGETS pyViewer DESTINATION ${PYTHON_SITE_PACKAGES} )

4
hurricane/src/isobar/Script.cpp → hurricane/src/viewer/Script.cpp
View File

@ -41,9 +41,9 @@
#include <sstream>
#include "hurricane/Error.h"
#include "hurricane/Cell.h"
#include "hurricane/viewer/PyCellViewer.h"
#include "hurricane/isobar/PyCell.h"
#include "hurricane/isobar/Script.h"
#include "hurricane/viewer/PyCellViewer.h"
#include "hurricane/viewer/Script.h"
namespace {

2
hurricane/src/viewer/ScriptWidget.cpp
View File

@ -31,7 +31,6 @@ using namespace std;
namespace bfs = boost::filesystem;
#include "hurricane/Warning.h"
#include "hurricane/isobar/Script.h"
#include <QLabel>
#include <QLineEdit>
@ -43,6 +42,7 @@ namespace bfs = boost::filesystem;
#include <QVBoxLayout>
#include "hurricane/viewer/Graphics.h"
#include "hurricane/viewer/Script.h"
#include "hurricane/viewer/ScriptWidget.h"
#include "hurricane/viewer/CellViewer.h"

0
hurricane/src/isobar/hurricane/isobar/Script.h → hurricane/src/viewer/hurricane/viewer/Script.h
View File