compatibility windows compilation with cmake

This commit is contained in:
adam 2009-02-24 09:20:50 +00:00
parent 49af6844da
commit a43f8fad30
12 changed files with 24 additions and 12 deletions

View File

@ -102,4 +102,5 @@ libBasicGUI_la_LDFLAGS = \
../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
$(CAS_LDFLAGS) -lTKGeomBase \
$(GUI_LDFLAGS) -lsuit $(GUI_LDFLAGS) -lsuit

View File

@ -101,4 +101,5 @@ libDlgRef_la_CPPFLAGS = \
libDlgRef_la_LDFLAGS = \ libDlgRef_la_LDFLAGS = \
$(STDLIB) \ $(STDLIB) \
$(QT_MT_LIBS) $(QT_MT_LIBS) \
$(GUI_LDFLAGS) -lqtx -lSalomeApp

View File

@ -75,6 +75,7 @@ libGEOMbasic_la_CPPFLAGS = \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix
libGEOMbasic_la_LDFLAGS = \ libGEOMbasic_la_LDFLAGS = \
$(CORBA_LIBS) \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
$(STDLIB) \ $(STDLIB) \
$(CAS_LDPATH) -lTKXSBase \ $(CAS_LDPATH) -lTKXSBase \

View File

@ -335,7 +335,8 @@ libGEOMAlgo_la_CPPFLAGS = \
libGEOMAlgo_la_LDFLAGS = \ libGEOMAlgo_la_LDFLAGS = \
../NMTTools/libNMTTools.la \ ../NMTTools/libNMTTools.la \
$(STDLIB) \ $(STDLIB) \
$(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh $(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace
# extra distributed files # extra distributed files
CDL_FILES = \ CDL_FILES = \

View File

@ -52,7 +52,7 @@ libGEOMClient_la_CPPFLAGS = \
libGEOMClient_la_LDFLAGS = \ libGEOMClient_la_LDFLAGS = \
../../idl/libSalomeIDLGEOM.la \ ../../idl/libSalomeIDLGEOM.la \
../GEOM/libGEOMbasic.la \ ../GEOM/libGEOMbasic.la \
$(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil \ $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSALOMEBasics -lOpUtil \
$(CAS_TKTopAlgo) $(CAS_TKTopAlgo)
# \ # \

View File

@ -66,7 +66,9 @@ libGEOMFiltersSelection_la_CPPFLAGS = \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix
libGEOMFiltersSelection_la_LDFLAGS = \ libGEOMFiltersSelection_la_LDFLAGS = \
$(QT_MT_LIBS) \
$(CAS_KERNEL) -lTKG3d -lTKV3d -lTKService \
../../idl/libSalomeIDLGEOM.la \ ../../idl/libSalomeIDLGEOM.la \
../GEOMClient/libGEOMClient.la \ ../GEOMClient/libGEOMClient.la \
$(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession \ $(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession -lSalomeObject -lLightApp \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS

View File

@ -83,8 +83,8 @@ libGEOM_la_LDFLAGS = \
../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
../GEOMClient/libGEOMClient.la \ ../GEOMClient/libGEOMClient.la \
../OBJECT/libGEOMObject.la \ ../OBJECT/libGEOMObject.la \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \
$(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd
# -lSalomeApp # -lSalomeApp
# -lToolsGUI # -lToolsGUI
# $(CORBA_LIBS) \ # $(CORBA_LIBS) \

View File

@ -75,4 +75,4 @@ libGEOMToolsGUI_la_CPPFLAGS = \
libGEOMToolsGUI_la_LDFLAGS = \ libGEOMToolsGUI_la_LDFLAGS = \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
$(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp -lPyConsole

View File

@ -91,7 +91,7 @@ libGEOMEngine_la_LDFLAGS = \
../GEOMImpl/libGEOMimpl.la \ ../GEOMImpl/libGEOMimpl.la \
../SKETCHER/libGEOMSketcher.la \ ../SKETCHER/libGEOMSketcher.la \
../GEOM/libGEOMbasic.la \ ../GEOM/libGEOMbasic.la \
$(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ $(KERNEL_LDFLAGS) -lOpUtil -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \
$(CAS_DATAEXCHANGE) \ $(CAS_DATAEXCHANGE) \
$(CAS_LDPATH) -lTKFillet -lTKOffset $(CAS_LDPATH) -lTKFillet -lTKOffset

View File

@ -60,6 +60,7 @@ libGEOM_SupervEngine_la_CPPFLAGS = \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix
libGEOM_SupervEngine_la_LDFLAGS = \ libGEOM_SupervEngine_la_LDFLAGS = \
../GEOM_I/libGEOMEngine.la \
$(CORBA_LIBS) \ $(CORBA_LIBS) \
$(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient \ $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient \
$(STDLIB) $(STDLIB)

View File

@ -120,5 +120,6 @@ libMeasureGUI_la_CPPFLAGS = \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix
libMeasureGUI_la_LDFLAGS = \ libMeasureGUI_la_LDFLAGS = \
$(CAS_LDFLAGS) -lTKGeomBase \
../GEOMBase/libGEOMBase.la ../GEOMBase/libGEOMBase.la

View File

@ -83,11 +83,15 @@ libGEOMObject_la_CPPFLAGS = \
$(GUI_CXXFLAGS) $(GUI_CXXFLAGS)
libGEOMObject_la_LDFLAGS = \ libGEOMObject_la_LDFLAGS = \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \ $(QT_MT_LIBS) \
$(GUI_LDFLAGS) -lqtx -lVTKViewer -lSVTK -lSalomeObject $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomAlgo -lTKTopAlgo -lTKService \
$(VTK_LIBS) \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
$(GUI_LDFLAGS) -lsuit -lqtx -lVTKViewer -lSVTK -lSalomeObject \
# $(CORBA_LIBS) \ # $(CORBA_LIBS) \
# $(STDLIB) \ # $(STDLIB) \
# $(PYTHON_LIBS) \ # $(PYTHON_LIBS) \
# $(QT_MT_LIBS) \
# $(VTK_LIBS) \
# $(OGL_LIBS) # $(OGL_LIBS)