* All tools:

- Library linking: there must not be "target_link_library()" for libraries,
        only when building binaries. Avoid clashes between static module
        or class variables, and strange reinitialisation of those variables.
    - Change: Boost is now always linked staticly.
This commit is contained in:
Jean-Paul Chaput 2010-07-01 11:50:37 +00:00
parent b80c3508d6
commit 6b5169d021
3 changed files with 37 additions and 7 deletions

View File

@ -62,7 +62,9 @@ ENDIF(IS_USR OR IS_OPT)
SET(QT_USE_QTXML "true") SET(QT_USE_QTXML "true")
FIND_PACKAGE(LibXml2 REQUIRED)
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
FIND_PACKAGE(PythonLibs REQUIRED)
FIND_PACKAGE(LEFDEF REQUIRED) FIND_PACKAGE(LEFDEF REQUIRED)
FIND_PACKAGE(VLSISAPD REQUIRED) FIND_PACKAGE(VLSISAPD REQUIRED)
FIND_PACKAGE(HURRICANE REQUIRED) FIND_PACKAGE(HURRICANE REQUIRED)
@ -77,6 +79,6 @@ FIND_PACKAGE(KITE REQUIRED)
#FIND_PACKAGE(SOLSTICE REQUIRED) #FIND_PACKAGE(SOLSTICE REQUIRED)
SET_LIB_LINK_MODE() SET_LIB_LINK_MODE()
FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem REQUIRED) FIND_PACKAGE(Boost 1.33.1 COMPONENTS filesystem program_options REQUIRED)
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)

View File

@ -6,6 +6,7 @@
${CORIOLIS_INCLUDE_DIR} ${CORIOLIS_INCLUDE_DIR}
${CONFIGURATION_INCLUDE_DIR} ${CONFIGURATION_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
) )
add_definitions ( -DSYS_CONF_DIR=\\"${SYS_CONF_DIR}\\" ) add_definitions ( -DSYS_CONF_DIR=\\"${SYS_CONF_DIR}\\" )
@ -40,6 +41,7 @@
${NIMBUS_GRAPHICAL_LIBRARIES} ${NIMBUS_GRAPHICAL_LIBRARIES}
${NIMBUS_LIBRARIES} ${NIMBUS_LIBRARIES}
${CORIOLIS_LIBRARIES} ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} ${HURRICANE_LIBRARIES}
${AGDS_LIBRARY} ${AGDS_LIBRARY}
@ -48,7 +50,9 @@
${LEFDEF_LIBRARIES} ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} ${OA_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${Boost_LIBRARIES} ${PYTHON_LIBRARIES}
-lutil
${LIBXML2_LIBRARIES}
) )
add_executable ( cgt ${cgtcpp} ) add_executable ( cgt ${cgtcpp} )
target_link_libraries ( cgt unicorn target_link_libraries ( cgt unicorn
@ -63,12 +67,15 @@
${KNIK_GRAPHICAL_LIBRARIES} ${KNIK_GRAPHICAL_LIBRARIES}
${KNIK_LIBRARIES} ${KNIK_LIBRARIES}
${CORIOLIS_LIBRARIES} ${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_LIBRARIES} ${HURRICANE_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES}
${CONFIGURATION_LIBRARY} ${CONFIGURATION_LIBRARY}
${OA_LIBRARIES} ${OA_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
-lutil
) )
install ( TARGETS unicorn DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS unicorn DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS cgt DESTINATION bin ) install ( TARGETS cgt DESTINATION bin )

View File

@ -33,17 +33,19 @@ namespace boptions = boost::program_options;
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
namespace bfs = boost::filesystem; namespace bfs = boost::filesystem;
#include <QtGui>
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and not defined (__APPLE__)
# include <QGtkStyle>
#endif
#include "vlsisapd/configuration/Configuration.h" #include "vlsisapd/configuration/Configuration.h"
#include "hurricane/DebugSession.h" #include "hurricane/DebugSession.h"
#include "hurricane/DataBase.h" #include "hurricane/DataBase.h"
#include "hurricane/Cell.h" #include "hurricane/Cell.h"
#include "hurricane/Warning.h" #include "hurricane/Warning.h"
#include "hurricane/UpdateSession.h" #include "hurricane/UpdateSession.h"
#include "hurricane/isobar/Script.h"
#include <QtGui>
#if (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) and not defined (__APPLE__)
# include <QGtkStyle>
#endif
#include "hurricane/viewer/HApplication.h" #include "hurricane/viewer/HApplication.h"
#include "hurricane/viewer/Graphics.h" #include "hurricane/viewer/Graphics.h"
using namespace Hurricane; using namespace Hurricane;
@ -93,6 +95,8 @@ int main ( int argc, char *argv[] )
bool kiteSuccess = true; bool kiteSuccess = true;
try { try {
bfs::path::default_name_check ( bfs::portable_posix_name );
float edgeCapacity; float edgeCapacity;
float expandStep; float expandStep;
unsigned long eventsLimit; unsigned long eventsLimit;
@ -333,6 +337,23 @@ int main ( int argc, char *argv[] )
// eFPGA/16x16. // eFPGA/16x16.
//DebugSession::addToTrace ( cell, "group_15_6_clb_topside_in1_mux_q01" ); //DebugSession::addToTrace ( cell, "group_15_6_clb_topside_in1_mux_q01" );
//DebugSession::addToTrace ( cell, "g_7_14_top_2" ); //DebugSession::addToTrace ( cell, "g_7_14_top_2" );
// Python Script test.
Isobar::Script::addPath ( "/dsk/l1/jpc/coriolis-2.x/work/benchs/routing/addaccu" );
for ( int i=0 ; i<5 ; ++i ) {
cerr << "Call:" << i << " ======================================" << endl;
Isobar::Script* script = Isobar::Script::create ( "getCellName" );
script->runFunction ( "runScript", cell );
}
Box box ( DbU::lambda(0.0), DbU::lambda(0.0), DbU::lambda(5.0), DbU::lambda(10.0) );
// throw Error ("Tu le vois bien: <b>%s</b><br>"
// "Un retour a la ligne\n<i>Une ligne</i>"
// ,getString(box).c_str() );
} }
if ( not textMode ) { if ( not textMode ) {