summaryrefslogtreecommitdiff
path: root/CIAO/examples/Display
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-03-06 12:01:22 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-03-06 12:01:22 +0000
commit75fb4970ea56a5f0afaf58e7de10ef973dcddc5e (patch)
tree7a70d25fd7ddebcc36ca66d495858aa183b6b088 /CIAO/examples/Display
parent8aec466335176315b0bf65d99cfdf6c7a4da03a2 (diff)
downloadATCD-75fb4970ea56a5f0afaf58e7de10ef973dcddc5e.tar.gz
Fri Mar 6 12:01:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/TargetManager/DomainDataManager.cpp * DAnCE/TargetManager/ResourceCommitmentManager.cpp layout changes * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc Moved moc files to their own project to resolve build problems build incredibuild
Diffstat (limited to 'CIAO/examples/Display')
-rw-r--r--CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc20
1 files changed, 15 insertions, 5 deletions
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 5b79dc4443a..bef5fb4c7c2 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,9 +1,20 @@
// $Id$
+project(Display_NavDisplayGUI_exec_moc) : ace_qt4, qt4_qt3support {
+ custom_only = 1
+ MOC_Files {
+ DetailView.h
+ MapView.h
+ NodeItem.h
+ RootPanel.h
+ }
+}
+
project(Display_NavDisplayGUI_exec) : ciao_executor, ace_qt4, qt4_qt3support {
avoids += ace_for_tao
after += Display_NavDisplay_cidl_gen \
- Display_NavDisplay_stub
+ Display_NavDisplay_stub \
+ Display_NavDisplayGUI_exec_moc
sharedname = NavDisplayGUI_exec
libs += NavDisplay_stub Display_Base_stub
dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL QT_DLL
@@ -34,10 +45,6 @@ project(Display_NavDisplayGUI_exec) : ciao_executor, ace_qt4, qt4_qt3support {
}
MOC_Files {
- DetailView.h
- MapView.h
- NodeItem.h
- RootPanel.h
}
Source_Files {
@@ -67,6 +74,9 @@ project(Display_NavDisplayGUI_svnt) : ciao_servant, ace_qt4, qt4_qt3support {
IDL_Files {
}
+ MOC_Files {
+ }
+
Source_Files {
../NavDisplay/NavDisplayS.cpp
../NavDisplay/NavDisplay_svnt.cpp