From 64e73eb606538d6e1adacbb2f43d0a335b836036 Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 10 Jun 2008 05:00:25 +0000 Subject: [PATCH] Improvement for remove dependence from Qt in install directory. --- src/Plot2d/Plot2d.pro | 4 ++++ src/Prs/Prs.pro | 5 +++++ src/PyConsole/PyConsole.pro | 4 ++++ src/PyInterp/PyInterp.pro | 4 ++++ src/Qtx/Qtx.pro | 5 +++++ src/STD/STD.pro | 4 ++++ src/SUIT/SUIT.pro | 4 ++++ src/SUITApp/SUITApp.pro | 4 ++++ src/SVTK/SVTK.pro | 4 ++++ src/Style/Style.pro | 4 ++++ src/TableViewer/TableViewer.pro | 4 ++++ src/VTKViewer/VTKViewer.pro | 4 ++++ 12 files changed, 50 insertions(+) diff --git a/src/Plot2d/Plot2d.pro b/src/Plot2d/Plot2d.pro index 8ff602108..976b8d7c1 100644 --- a/src/Plot2d/Plot2d.pro +++ b/src/Plot2d/Plot2d.pro @@ -1,6 +1,8 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET @@ -10,6 +12,8 @@ INCLUDEPATH += ../Qtx ../SUIT unix:LIBS += -L$$(QWTLIB) -lqwt win32:LIBS += /LIBPATH:$$(QWTLIB) -lqwt5 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/Prs/Prs.pro b/src/Prs/Prs.pro index e853290cb..b4fe7e1fc 100644 --- a/src/Prs/Prs.pro +++ b/src/Prs/Prs.pro @@ -1,10 +1,15 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml + CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro index a63deb48b..04e08a5e9 100644 --- a/src/PyConsole/PyConsole.pro +++ b/src/PyConsole/PyConsole.pro @@ -1,6 +1,8 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET @@ -8,6 +10,8 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET INCLUDEPATH += ../../include $$(PYTHONINC) unix:LIBS += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython2.5 -lSUIT -lPyInterp win32:LIBS += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython25_d -lSUIT -lPyInterp -lQtx +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/PyInterp/PyInterp.pro b/src/PyInterp/PyInterp.pro index 9913c9348..bc1afac79 100644 --- a/src/PyInterp/PyInterp.pro +++ b/src/PyInterp/PyInterp.pro @@ -1,6 +1,8 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET @@ -8,6 +10,8 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET INCLUDEPATH += ../../include $$(PYTHONINC) unix:LIBS += -L$$(PYTHONLIB) -lpython2.5 win32:LIBS += -L$$(PYTHONLIB) -lpython25_d +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro index f676fff3f..f0dcfcb17 100644 --- a/src/Qtx/Qtx.pro +++ b/src/Qtx/Qtx.pro @@ -3,10 +3,15 @@ unix:TEMPLATE = lib CONFIG += embed_manifest_exe +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml + QT += xml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/STD/STD.pro b/src/STD/STD.pro index 8bc7c46b1..06b048327 100644 --- a/src/STD/STD.pro +++ b/src/STD/STD.pro @@ -1,12 +1,16 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET INCLUDEPATH = ../../include LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro index a2308c0cb..61c6078e6 100644 --- a/src/SUIT/SUIT.pro +++ b/src/SUIT/SUIT.pro @@ -1,12 +1,16 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET INCLUDEPATH = ../../include LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lObjBrowser +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/SUITApp/SUITApp.pro b/src/SUITApp/SUITApp.pro index c695d5326..e5edddab5 100644 --- a/src/SUITApp/SUITApp.pro +++ b/src/SUITApp/SUITApp.pro @@ -3,12 +3,16 @@ win32:TEMPLATE = vcapp CONFIG -= embed_manifest_exe +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/bin MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET INCLUDEPATH = ../../include LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx -lStyle -lObjBrowser +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro index 0e1c32832..b51c7481e 100644 --- a/src/SVTK/SVTK.pro +++ b/src/SVTK/SVTK.pro @@ -1,6 +1,8 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET @@ -16,6 +18,8 @@ win32:OCC_LIBS = -L$(CASLIB) -lTKernel INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $$(VTKINC) $$(BOOSTINC) ../Qtx ../SUIT ../OBJECT ../Prs ../VTKViewer LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT -lOBJECT -lPrs -lVTKViewer $${OCC_LIBS} $${VTK_LIBS} win32: LIBS += -lTKernel +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/Style/Style.pro b/src/Style/Style.pro index a9523ce8f..6464ee83e 100644 --- a/src/Style/Style.pro +++ b/src/Style/Style.pro @@ -1,12 +1,16 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET INCLUDEPATH = ../../include LIBS += -L../../$(CONFIG_ID)/lib -lQtx +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/TableViewer/TableViewer.pro b/src/TableViewer/TableViewer.pro index 4e612cfae..8c0d63320 100644 --- a/src/TableViewer/TableViewer.pro +++ b/src/TableViewer/TableViewer.pro @@ -1,6 +1,8 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET @@ -10,6 +12,8 @@ CAS_KERNEL = -L$(CASLIB) -lTKernel INCLUDEPATH = ../../include $${CAS_CPPFLAGS} LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${CAS_KERNEL} -lHTMLService +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro index 529e28077..1a8b2bab8 100644 --- a/src/VTKViewer/VTKViewer.pro +++ b/src/VTKViewer/VTKViewer.pro @@ -1,6 +1,8 @@ unix:TEMPLATE = lib win32:TEMPLATE = vclib +win32:QMAKE_MOC=$(QTDIR)\bin\moc.exe + DESTDIR = ../../$(CONFIG_ID)/lib MOC_DIR = ../../moc OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET @@ -14,6 +16,8 @@ CAS_KERNEL = -L$(CASLIB) -lTKernel INCLUDEPATH += ../../include $$(VTKINC) $${CAS_CPPFLAGS} ../Qtx ../SUIT LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${VTK_LIBS} $${CAS_KERNEL} +win32:LIBS *= -L$(QTLIB) +win32:INCLUDEPATH *= $(QTINC) $(QTINC)\QtCore $(QTINC)\QtGui $(QTINC)\QtXml CONFIG -= debug release debug_and_release CONFIG += qt thread debug dll shared -- 2.39.2