Salome HOME
compatibility windows compilation with cmake
authoradam <adam>
Tue, 24 Feb 2009 09:27:39 +0000 (09:27 +0000)
committeradam <adam>
Tue, 24 Feb 2009 09:27:39 +0000 (09:27 +0000)
src/Controls/Makefile.am
src/Driver/Makefile.am
src/MEFISTO2/Makefile.am
src/OBJECT/Makefile.am
src/SMESH/Makefile.am
src/SMESHClient/Makefile.am
src/SMESHFiltersSelection/Makefile.am
src/SMESHGUI/Makefile.am
src/SMESH_SWIG_WITHIHM/Makefile.am

index 0dd516e..90707ca 100644 (file)
@@ -53,7 +53,7 @@ libSMESHControls_la_CPPFLAGS = \
 libSMESHControls_la_LDFLAGS = \
        ../SMDS/libSMDS.la \
        ../SMESHDS/libSMESHDS.la \
-       $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d
+       $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo
 
 SMESHControls_CPPFLAGS = \
        $(libSMESHControls_la_CPPFLAGS)
index 0534f2a..70b7a2b 100644 (file)
@@ -53,4 +53,4 @@ libMeshDriver_la_CPPFLAGS = \
 libMeshDriver_la_LDFLAGS  = \
        ../SMESHDS/libSMESHDS.la \
        $(KERNEL_LDFLAGS) -lOpUtil \
-       $(CAS_LDPATH) -TKernel -lTKTopAlgo
+       $(CAS_LDPATH) -lTKernel -lTKTopAlgo
index 1f0e496..b4e94a8 100644 (file)
@@ -43,6 +43,7 @@ libMEFISTO2D_la_CPPFLAGS = \
        @PLATFORM_INCLUDES@
 
 libMEFISTO2D_la_LDFLAGS = \
+       $(CAS_LDFLAGS) -lTKernel -lTKMath \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
        $(FCLIBS)
 
index 3bc3907..bd23366 100644 (file)
@@ -57,6 +57,7 @@ libSMESHObject_la_CPPFLAGS = \
        $(CAS_CPPFLAGS) \
         $(VTK_INCLUDES) \
        $(CORBA_INCLUDES) \
+       $(CORBA_CXXFLAGS) \
         $(BOOST_CPPFLAGS) \
         $(QT_INCLUDES) \
        -I$(srcdir)/../Controls \
@@ -73,6 +74,6 @@ libSMESHObject_la_LDFLAGS  = \
         ../SMESHClient/libSMESHClient.la \
         ../SMDS/libSMDS.la \
         ../Controls/libSMESHControls.la \
-        $(GUI_LDFLAGS) -lSalomeApp lSalomeObject \
+        $(GUI_LDFLAGS) -lSalomeApp -lSalomeObject -lSVTK -lVTKViewer -lqtx -lsuit \
        $(CAS_KERNEL) \
-        $(VTK_LIBS)
+        $(VTK_LIBS) $(QT_MT_LIBS)
index 2905cc9..ce65291 100644 (file)
@@ -106,4 +106,4 @@ libSMESHimpl_la_LDFLAGS = \
        ../DriverMED/libMeshDriverMED.la \
        ../DriverUNV/libMeshDriverUNV.la \
        $(GEOM_LDFLAGS) -lNMTTools \
-       $(CAS_LDPATH) -lTKShHealing
+       $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d
index ebb0d97..e44db75 100644 (file)
@@ -68,7 +68,7 @@ libSMESHClient_la_LDFLAGS  = \
        ../SMESH/libSMESHimpl.la \
        ../SMESHDS/libSMESHDS.la \
        ../Controls/libSMESHControls.la \
-       $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \
+       $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
        $(GEOM_LDFLAGS) -lNMTDS \
        $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 \
        $(CAS_KERNEL)
index 183083c..a0d49e8 100644 (file)
@@ -63,6 +63,7 @@ libSMESHFiltersSelection_la_CPPFLAGS = \
 libSMESHFiltersSelection_la_LDFLAGS  = \
        ../../idl/libSalomeIDLSMESH.la \
        $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \
-       $(GUI_LDFLAGS) -lSalomeApp -lsuit \
-       $(GEOM_LDFLAGS) -lGEOM \
-       $(CAS_LDPATH) -lTKernel
+       $(GUI_LDFLAGS) -lSalomeApp -lsuit -lLightApp \
+       $(GEOM_LDFLAGS) -lGEOM -lGEOMClient \
+       $(CAS_LDPATH) -lTKernel -lTKMath -lTKBRep \
+       $(QT_MT_LIBS)
index db28867..bd8db3b 100644 (file)
@@ -246,8 +246,9 @@ libSMESH_la_LDFLAGS  = \
        ../SMDS/libSMDS.la \
        ../Controls/libSMESHControls.la \
        ../OBJECT/libSMESHObject.la \
-       $(GEOM_LDFLAGS) \
-       -lGEOMBase
+       $(CAS_LDFLAGS) -lTKV3d \
+       $(GUI_LDFLAGS) -lSalomePrs -lsuit -lSUITApp -lCAM -lstd \
+       $(GEOM_LDFLAGS) -lGEOMBase -lGEOMFiltersSelection -lGEOMObject
 
 # resources files
 nodist_salomeres_DATA= \
index 69ae00d..e540dd1 100644 (file)
@@ -71,6 +71,7 @@ _libSMESH_Swig_la_CPPFLAGS =  \
        $(CORBA_CXXFLAGS)       \
        $(CORBA_INCLUDES)       \
        $(BOOST_CPPFLAGS)       \
+       -I$(srcdir)             \
        -I$(srcdir)/../SMESHGUI \
        -I$(top_builddir)/idl   \
        -I$(top_builddir)/salome_adm/unix