compatibility windows compilation with cmake

This commit is contained in:
adam 2009-02-24 09:27:39 +00:00
parent 2401f44552
commit d5dd2d9628
9 changed files with 16 additions and 11 deletions

View File

@ -53,7 +53,7 @@ libSMESHControls_la_CPPFLAGS = \
libSMESHControls_la_LDFLAGS = \ libSMESHControls_la_LDFLAGS = \
../SMDS/libSMDS.la \ ../SMDS/libSMDS.la \
../SMESHDS/libSMESHDS.la \ ../SMESHDS/libSMESHDS.la \
$(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo
SMESHControls_CPPFLAGS = \ SMESHControls_CPPFLAGS = \
$(libSMESHControls_la_CPPFLAGS) $(libSMESHControls_la_CPPFLAGS)

View File

@ -53,4 +53,4 @@ libMeshDriver_la_CPPFLAGS = \
libMeshDriver_la_LDFLAGS = \ libMeshDriver_la_LDFLAGS = \
../SMESHDS/libSMESHDS.la \ ../SMESHDS/libSMESHDS.la \
$(KERNEL_LDFLAGS) -lOpUtil \ $(KERNEL_LDFLAGS) -lOpUtil \
$(CAS_LDPATH) -TKernel -lTKTopAlgo $(CAS_LDPATH) -lTKernel -lTKTopAlgo

View File

@ -43,6 +43,7 @@ libMEFISTO2D_la_CPPFLAGS = \
@PLATFORM_INCLUDES@ @PLATFORM_INCLUDES@
libMEFISTO2D_la_LDFLAGS = \ libMEFISTO2D_la_LDFLAGS = \
$(CAS_LDFLAGS) -lTKernel -lTKMath \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
$(FCLIBS) $(FCLIBS)

View File

@ -57,6 +57,7 @@ libSMESHObject_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(VTK_INCLUDES) \ $(VTK_INCLUDES) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(CORBA_CXXFLAGS) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(QT_INCLUDES) \ $(QT_INCLUDES) \
-I$(srcdir)/../Controls \ -I$(srcdir)/../Controls \
@ -73,6 +74,6 @@ libSMESHObject_la_LDFLAGS = \
../SMESHClient/libSMESHClient.la \ ../SMESHClient/libSMESHClient.la \
../SMDS/libSMDS.la \ ../SMDS/libSMDS.la \
../Controls/libSMESHControls.la \ ../Controls/libSMESHControls.la \
$(GUI_LDFLAGS) -lSalomeApp lSalomeObject \ $(GUI_LDFLAGS) -lSalomeApp -lSalomeObject -lSVTK -lVTKViewer -lqtx -lsuit \
$(CAS_KERNEL) \ $(CAS_KERNEL) \
$(VTK_LIBS) $(VTK_LIBS) $(QT_MT_LIBS)

View File

@ -106,4 +106,4 @@ libSMESHimpl_la_LDFLAGS = \
../DriverMED/libMeshDriverMED.la \ ../DriverMED/libMeshDriverMED.la \
../DriverUNV/libMeshDriverUNV.la \ ../DriverUNV/libMeshDriverUNV.la \
$(GEOM_LDFLAGS) -lNMTTools \ $(GEOM_LDFLAGS) -lNMTTools \
$(CAS_LDPATH) -lTKShHealing $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d

View File

@ -68,7 +68,7 @@ libSMESHClient_la_LDFLAGS = \
../SMESH/libSMESHimpl.la \ ../SMESH/libSMESHimpl.la \
../SMESHDS/libSMESHDS.la \ ../SMESHDS/libSMESHDS.la \
../Controls/libSMESHControls.la \ ../Controls/libSMESHControls.la \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
$(GEOM_LDFLAGS) -lNMTDS \ $(GEOM_LDFLAGS) -lNMTDS \
$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 \ $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 \
$(CAS_KERNEL) $(CAS_KERNEL)

View File

@ -63,6 +63,7 @@ libSMESHFiltersSelection_la_CPPFLAGS = \
libSMESHFiltersSelection_la_LDFLAGS = \ libSMESHFiltersSelection_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \ ../../idl/libSalomeIDLSMESH.la \
$(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \ $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \
$(GUI_LDFLAGS) -lSalomeApp -lsuit \ $(GUI_LDFLAGS) -lSalomeApp -lsuit -lLightApp \
$(GEOM_LDFLAGS) -lGEOM \ $(GEOM_LDFLAGS) -lGEOM -lGEOMClient \
$(CAS_LDPATH) -lTKernel $(CAS_LDPATH) -lTKernel -lTKMath -lTKBRep \
$(QT_MT_LIBS)

View File

@ -246,8 +246,9 @@ libSMESH_la_LDFLAGS = \
../SMDS/libSMDS.la \ ../SMDS/libSMDS.la \
../Controls/libSMESHControls.la \ ../Controls/libSMESHControls.la \
../OBJECT/libSMESHObject.la \ ../OBJECT/libSMESHObject.la \
$(GEOM_LDFLAGS) \ $(CAS_LDFLAGS) -lTKV3d \
-lGEOMBase $(GUI_LDFLAGS) -lSalomePrs -lsuit -lSUITApp -lCAM -lstd \
$(GEOM_LDFLAGS) -lGEOMBase -lGEOMFiltersSelection -lGEOMObject
# resources files # resources files
nodist_salomeres_DATA= \ nodist_salomeres_DATA= \

View File

@ -71,6 +71,7 @@ _libSMESH_Swig_la_CPPFLAGS = \
$(CORBA_CXXFLAGS) \ $(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
-I$(srcdir) \
-I$(srcdir)/../SMESHGUI \ -I$(srcdir)/../SMESHGUI \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \
-I$(top_builddir)/salome_adm/unix -I$(top_builddir)/salome_adm/unix