From a43f8fad309382694bcec14070052ec910556ccc Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 24 Feb 2009 09:20:50 +0000 Subject: [PATCH] compatibility windows compilation with cmake --- src/BasicGUI/Makefile.am | 1 + src/DlgRef/Makefile.am | 3 ++- src/GEOM/Makefile.am | 1 + src/GEOMAlgo/Makefile.am | 3 ++- src/GEOMClient/Makefile.am | 2 +- src/GEOMFiltersSelection/Makefile.am | 4 +++- src/GEOMGUI/Makefile.am | 4 ++-- src/GEOMToolsGUI/Makefile.am | 2 +- src/GEOM_I/Makefile.am | 2 +- src/GEOM_I_Superv/Makefile.am | 1 + src/MeasureGUI/Makefile.am | 1 + src/OBJECT/Makefile.am | 12 ++++++++---- 12 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am index 2d364c18e..4253ea5a5 100644 --- a/src/BasicGUI/Makefile.am +++ b/src/BasicGUI/Makefile.am @@ -102,4 +102,5 @@ libBasicGUI_la_LDFLAGS = \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMBase/libGEOMBase.la \ ../GEOMGUI/libGEOM.la \ + $(CAS_LDFLAGS) -lTKGeomBase \ $(GUI_LDFLAGS) -lsuit diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am index 3a4606f02..4d3a1e05e 100644 --- a/src/DlgRef/Makefile.am +++ b/src/DlgRef/Makefile.am @@ -101,4 +101,5 @@ libDlgRef_la_CPPFLAGS = \ libDlgRef_la_LDFLAGS = \ $(STDLIB) \ - $(QT_MT_LIBS) + $(QT_MT_LIBS) \ + $(GUI_LDFLAGS) -lqtx -lSalomeApp diff --git a/src/GEOM/Makefile.am b/src/GEOM/Makefile.am index 4ab7a8b7c..233b5139a 100644 --- a/src/GEOM/Makefile.am +++ b/src/GEOM/Makefile.am @@ -75,6 +75,7 @@ libGEOMbasic_la_CPPFLAGS = \ -I$(top_builddir)/salome_adm/unix libGEOMbasic_la_LDFLAGS = \ + $(CORBA_LIBS) \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ $(STDLIB) \ $(CAS_LDPATH) -lTKXSBase \ diff --git a/src/GEOMAlgo/Makefile.am b/src/GEOMAlgo/Makefile.am index 4f0ddc371..a8d0b6dc8 100644 --- a/src/GEOMAlgo/Makefile.am +++ b/src/GEOMAlgo/Makefile.am @@ -335,7 +335,8 @@ libGEOMAlgo_la_CPPFLAGS = \ libGEOMAlgo_la_LDFLAGS = \ ../NMTTools/libNMTTools.la \ $(STDLIB) \ - $(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh + $(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace # extra distributed files CDL_FILES = \ diff --git a/src/GEOMClient/Makefile.am b/src/GEOMClient/Makefile.am index 6db3208fe..f66b57921 100644 --- a/src/GEOMClient/Makefile.am +++ b/src/GEOMClient/Makefile.am @@ -52,7 +52,7 @@ libGEOMClient_la_CPPFLAGS = \ libGEOMClient_la_LDFLAGS = \ ../../idl/libSalomeIDLGEOM.la \ ../GEOM/libGEOMbasic.la \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil \ + $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSALOMEBasics -lOpUtil \ $(CAS_TKTopAlgo) # \ diff --git a/src/GEOMFiltersSelection/Makefile.am b/src/GEOMFiltersSelection/Makefile.am index d84453a4e..b25fd9788 100644 --- a/src/GEOMFiltersSelection/Makefile.am +++ b/src/GEOMFiltersSelection/Makefile.am @@ -66,7 +66,9 @@ libGEOMFiltersSelection_la_CPPFLAGS = \ -I$(top_builddir)/salome_adm/unix libGEOMFiltersSelection_la_LDFLAGS = \ + $(QT_MT_LIBS) \ + $(CAS_KERNEL) -lTKG3d -lTKV3d -lTKService \ ../../idl/libSalomeIDLGEOM.la \ ../GEOMClient/libGEOMClient.la \ - $(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession \ + $(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession -lSalomeObject -lLightApp \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am index 9dc50a430..1d2ffde06 100644 --- a/src/GEOMGUI/Makefile.am +++ b/src/GEOMGUI/Makefile.am @@ -83,8 +83,8 @@ libGEOM_la_LDFLAGS = \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMClient/libGEOMClient.la \ ../OBJECT/libGEOMObject.la \ - $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \ - $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent + $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \ + $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd # -lSalomeApp # -lToolsGUI # $(CORBA_LIBS) \ diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am index 4f879990b..d07577bf2 100644 --- a/src/GEOMToolsGUI/Makefile.am +++ b/src/GEOMToolsGUI/Makefile.am @@ -75,4 +75,4 @@ libGEOMToolsGUI_la_CPPFLAGS = \ libGEOMToolsGUI_la_LDFLAGS = \ ../GEOMBase/libGEOMBase.la \ ../GEOMGUI/libGEOM.la \ - $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp + $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp -lPyConsole diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am index 445804206..5a6e6caa0 100644 --- a/src/GEOM_I/Makefile.am +++ b/src/GEOM_I/Makefile.am @@ -91,7 +91,7 @@ libGEOMEngine_la_LDFLAGS = \ ../GEOMImpl/libGEOMimpl.la \ ../SKETCHER/libGEOMSketcher.la \ ../GEOM/libGEOMbasic.la \ - $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ + $(KERNEL_LDFLAGS) -lOpUtil -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ $(CAS_DATAEXCHANGE) \ $(CAS_LDPATH) -lTKFillet -lTKOffset diff --git a/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am index 69edb9a10..d9fc822cf 100644 --- a/src/GEOM_I_Superv/Makefile.am +++ b/src/GEOM_I_Superv/Makefile.am @@ -60,6 +60,7 @@ libGEOM_SupervEngine_la_CPPFLAGS = \ -I$(top_builddir)/salome_adm/unix libGEOM_SupervEngine_la_LDFLAGS = \ + ../GEOM_I/libGEOMEngine.la \ $(CORBA_LIBS) \ $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient \ $(STDLIB) diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am index 3e5229249..ad0ebe941 100644 --- a/src/MeasureGUI/Makefile.am +++ b/src/MeasureGUI/Makefile.am @@ -120,5 +120,6 @@ libMeasureGUI_la_CPPFLAGS = \ -I$(top_builddir)/salome_adm/unix libMeasureGUI_la_LDFLAGS = \ + $(CAS_LDFLAGS) -lTKGeomBase \ ../GEOMBase/libGEOMBase.la diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 671ab5c4c..61afc9eba 100644 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -83,11 +83,15 @@ libGEOMObject_la_CPPFLAGS = \ $(GUI_CXXFLAGS) libGEOMObject_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(GUI_LDFLAGS) -lqtx -lVTKViewer -lSVTK -lSalomeObject + $(QT_MT_LIBS) \ + $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomAlgo -lTKTopAlgo -lTKService \ + $(VTK_LIBS) \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(GUI_LDFLAGS) -lsuit -lqtx -lVTKViewer -lSVTK -lSalomeObject \ + + + # $(CORBA_LIBS) \ # $(STDLIB) \ # $(PYTHON_LIBS) \ -# $(QT_MT_LIBS) \ -# $(VTK_LIBS) \ # $(OGL_LIBS) -- 2.39.2