Skip to content

Commit bdba43d

Browse files
committed
- Added support for omniORB in qtclients.
+ We can now remove the dependency on mico for Linux systems. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5344 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent bb4ecf5 commit bdba43d

File tree

6 files changed

+22
-999
lines changed

6 files changed

+22
-999
lines changed

OMNotebook/OMNotebookQT4/OMNotebook.pro

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,19 @@ INCLUDEPATH += . \
99
/usr/local/include
1010
#OBJECTS +=
1111

12-
MICO_LIBS = $$system(mico-config --libs)
12+
win32 {
13+
CORBAINC = $$system(mico-config --prefix)/include
14+
CORBALIBS = $$system(mico-config --libs)
15+
DEFINES += HAVE_MICO
16+
} else {
17+
CORBAINC = $$(CORBACFLAGS)
18+
CORBALIBS = $$(CORBALIBS)
19+
DEFINES += $$(USE_CORBA)
20+
}
21+
1322
COIN_LIBS = $$system(coin-config --ldflags --libs)
1423
SOQT_LIBS = $$system(soqt-config --ldflags --libs)
15-
unix:LIBS += -L${ANTLRHOME}/src -lantlr $${MICO_LIBS} $${COIN_LIBS} $${SOQT_LIBS}
24+
unix:LIBS += -L${ANTLRHOME}/src -lantlr $${CORBALIBS} $${COIN_LIBS} $${SOQT_LIBS}
1625

1726

1827
TARGET = OMNotebook
@@ -26,10 +35,9 @@ QMAKE_LFLAGS+=
2635
#correctly. If omc not is installed on the system. Comment out
2736
#theese three lines below.
2837
DEFINES += OMC
29-
MICOHOME = $$system(mico-config --prefix)
3038
COIN_INCLUDE = $$system(coin-config --includedir)
3139
SOQT_INCLUDE = $$system(soqt-config --includedir)
32-
INCLUDEPATH += $${MICOHOME}/include \
40+
INCLUDEPATH += $${CORBAINC} \
3341
$${COIN_INCLUDE} \
3442
$${SOQT_INCLUDE} \
3543
/usr/include/qt4/ \

0 commit comments

Comments
 (0)