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

Fixed non-Ruby build where DRC is not available.

This commit is contained in:
Matthias Koefferlein 2017-09-03 11:51:39 +02:00
parent b9c302229f
commit 9d5f54d51a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/klayout_main/klayout.cc
View File

@ -40,7 +40,9 @@
#include "libForceLink.h"
#include "antForceLink.h"
#include "imgForceLink.h"
#ifdef HAVE_RUBY
#include "drcForceLink.h"
#endif
#include <QTranslator>
#include <QLocale>

2
src/unit_tests/unit_test_main.cc
View File

@ -49,7 +49,9 @@
// required to force linking of the "ext", "lib" and "drc" module
#include "extForceLink.h"
#include "libForceLink.h"
#if defined(HAVE_RUBY)
#include "drcForceLink.h"
#endif
static int main_cont (int argc, char **argv);

13
src/with_all_libs.pri
View File

@ -1,8 +1,8 @@
INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC $$LAYBASIC_INC $$LAY_INC $$ANT_INC $$IMG_INC $$EDT_INC $$DRC_INC $$EXT_INC $$LIB_INC $$RBA_INC $$PYA_INC $$VERSION_INC
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC $$LAYBASIC_INC $$LAY_INC $$ANT_INC $$IMG_INC $$EDT_INC $$DRC_INC $$EXT_INC $$LIB_INC $$RBA_INC $$PYA_INC $$VERSION_INC
INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC $$LAYBASIC_INC $$LAY_INC $$ANT_INC $$IMG_INC $$EDT_INC $$EXT_INC $$LIB_INC $$RBA_INC $$PYA_INC $$VERSION_INC
DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC $$LAYBASIC_INC $$LAY_INC $$ANT_INC $$IMG_INC $$EDT_INC $$EXT_INC $$LIB_INC $$RBA_INC $$PYA_INC $$VERSION_INC
LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_lay -lklayout_ant -lklayout_img -lklayout_edt -lklayout_drc -lklayout_ext -lklayout_lib
LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_lym -lklayout_laybasic -lklayout_lay -lklayout_ant -lklayout_img -lklayout_edt -lklayout_ext -lklayout_lib
# Note: this accounts for UI-generated headers placed into the output folders in
# shadow builds:
@ -26,3 +26,10 @@ equals(HAVE_PYTHON, "1") {
} else {
LIBS += -lklayout_pyastub
}
equals(HAVE_RUBY, "1") {
# DRC is only available with Ruby
INCLUDEPATH += $$DRC_INC
DEPENDPATH += $$DRC_INC
LIBS += -lklayout_drc
}