luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a few build issues.

This commit is contained in:
Matthias Koefferlein 2017-08-27 00:08:34 +02:00
parent 79811994f6
commit 016bb865ee
4 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lay/lay.pro
View File

@ -168,8 +168,8 @@ RESOURCES = layBuildInMacros.qrc \
layResources.qrc \
laySaltTemplates.qrc
INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC
INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LAYBASIC_INC $$ANT_INC $$IMG_INC $$EDT_INC $$LYM_INC
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_ant -lklayout_img -lklayout_edt
win32 {

4
src/laybasic/laybasic.pro
View File

@ -277,8 +277,8 @@ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb
INCLUDEPATH += $GSIQT_INC
DEPENDPATH += $GSIQT_INC
INCLUDEPATH += $$GSIQT_INC
DEPENDPATH += $$GSIQT_INC
equals(HAVE_QTBINDINGS, "1") {
LIBS += -lklayout_gsiqt

18
src/ut/ut.pro
View File

@ -20,28 +20,26 @@ SOURCES = \
utTestConsole.cc \
utTestBase.cc \
INCLUDEPATH = ../tl ../db ../gsi ../lay ../ext ../lib
DEPENDPATH = ../tl ../db ../gsi ../lay ../ext ../lib
INCLUDEPATH = $$TL_INC $$DB_INC $$GSI_INC $$LAY_INC $$EXT_INC $$LIB_INC
DEPENDPATH = $$TL_INC $$DB_INC $$GSI_INC $$LAY_INC $$EXT_INC $$LIB_INC
LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lay -lklayout_ext -lklayout_lib
INCLUDEPATH += $$RBA_INC
DEPENDPATH += $$RBA_INC
equals(HAVE_RUBY, "1") {
INCLUDEPATH += ../rba
DEPENDPATH += ../rba
LIBS += -lklayout_rba
} else {
INCLUDEPATH += ../rbastub
DEPENDPATH += ../rbastub
LIBS += -lklayout_rbastub
}
INCLUDEPATH += $$PYA_INC
DEPENDPATH += $$PYA_INC
equals(HAVE_PYTHON, "1") {
INCLUDEPATH += ../pya
DEPENDPATH += ../pya
LIBS += -lklayout_pya
} else {
INCLUDEPATH += ../pyastub
DEPENDPATH += ../pyastub
LIBS += -lklayout_pyastub
}

28
src/ut/utMain.cc
View File

@ -80,7 +80,7 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
std::string mode (e == 0 ? "non-editable" : "editable");
ut::ctrl << "<testsuite name=\"ut-runner-" << mode << "\">";
ut::noctrl << replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << "Running tests in " << mode << " mode ...";
app.set_editable (e != 0);
@ -108,14 +108,14 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
ut::ctrl << "<testcase name=\"" << (*t)->name () << "\">";
ut::noctrl << replicate ("-", TestConsole::instance ()->real_columns ());
ut::noctrl << tl::replicate ("-", TestConsole::instance ()->real_columns ());
ut::noctrl << "Running " << (*t)->name ();
try {
if (! (*t)->do_test (e != 0, slow)) {
ut::ctrl << "<error message=\"" << "Test " << escaped_to_html ((*t)->name ()) << " failed (continued mode - see previous messages)" << "\"/>";
ut::ctrl << "<error message=\"" << "Test " << tl::escaped_to_html ((*t)->name ()) << " failed (continued mode - see previous messages)" << "\"/>";
tl::error << "Test " << (*t)->name () << " failed (continued mode - see previous messages)";
failed_tests.push_back (*t);
@ -133,7 +133,7 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
} catch (tl::Exception &ex) {
ut::ctrl << "<failure message=\"" << escaped_to_html (ex.msg ()) << "\"/>";
ut::ctrl << "<failure message=\"" << tl::escaped_to_html (ex.msg ()) << "\"/>";
tl::error << "Test " << (*t)->name () << " failed:";
tl::info << ex.msg ();
@ -161,7 +161,7 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
ut::ctrl << "<x-summary mode=\"" << mode << "\">";
ut::noctrl << replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << "Summary";
if (skipped > 0) {
@ -204,7 +204,7 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
// GSI diagnostics: print all methods that have not been called
if (gsi_coverage) {
ut::noctrl << replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << "GSI coverage test";
ut::ctrl << "<x-gsi-coverage>";
@ -226,10 +226,10 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
tl::warn << "GSI coverage test failed - the following methods were not called:";
}
if (first_of_class) {
tl::warn << replicate (" ", TestConsole::instance ()->indent ()) << "Class " << c->name ();
tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << "Class " << c->name ();
first_of_class = false;
}
tl::warn << replicate (" ", TestConsole::instance ()->indent () * 2) << (*m)->to_string ();
tl::warn << tl::replicate (" ", TestConsole::instance ()->indent () * 2) << (*m)->to_string ();
}
@ -245,7 +245,7 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
}
ut::noctrl << ut::replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << tl::replicate ("=", TestConsole::instance ()->real_columns ());
ut::noctrl << "Grand Summary";
ut::ctrl << "<x-grand-summary>";
@ -254,13 +254,13 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
if (non_editable) {
tl::warn << "Skipped in non-editable mode";
for (std::vector <ut::TestBase *>::const_iterator f = skipped_tests_ne.begin (); f != skipped_tests_ne.end (); ++f) {
tl::warn << replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
}
}
if (editable) {
tl::warn << "Skipped in editable mode";
for (std::vector <ut::TestBase *>::const_iterator f = skipped_tests_e.begin (); f != skipped_tests_e.end (); ++f) {
tl::warn << replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
}
}
tl::warn << tl::to_string (skipped_e + skipped_ne) << " test(s) skipped";
@ -271,13 +271,13 @@ run_tests (const std::vector<ut::TestBase *> &selected_tests, bool editable, boo
if (non_editable) {
tl::warn << "Failed in non-editable mode";
for (std::vector <ut::TestBase *>::const_iterator f = failed_tests_ne.begin (); f != failed_tests_ne.end (); ++f) {
tl::warn << replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
}
}
if (editable) {
tl::warn << "Failed in editable mode";
for (std::vector <ut::TestBase *>::const_iterator f = failed_tests_e.begin (); f != failed_tests_e.end (); ++f) {
tl::warn << replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
tl::warn << tl::replicate (" ", TestConsole::instance ()->indent ()) << (*f)->name ();
}
}
tl::warn << tl::to_string (result) << " test(s) failed";
@ -419,7 +419,7 @@ main_cont (int argc, char **argv)
ut::TestConsole console (stdout, xml_format);
ut::noctrl << replicate ("=", console.real_columns ());
ut::noctrl << tl::replicate ("=", console.real_columns ());
ut::noctrl << "Entering KLayout test suite";
tl::info << "TESTSRC=" << ut::testsrc ();