Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2401f44
)
compatibility windows compilation with cmake
author
adam
<adam>
Tue, 24 Feb 2009 09:27:39 +0000
(09:27 +0000)
committer
adam
<adam>
Tue, 24 Feb 2009 09:27:39 +0000
(09:27 +0000)
src/Controls/Makefile.am
patch
|
blob
|
history
src/Driver/Makefile.am
patch
|
blob
|
history
src/MEFISTO2/Makefile.am
patch
|
blob
|
history
src/OBJECT/Makefile.am
patch
|
blob
|
history
src/SMESH/Makefile.am
patch
|
blob
|
history
src/SMESHClient/Makefile.am
patch
|
blob
|
history
src/SMESHFiltersSelection/Makefile.am
patch
|
blob
|
history
src/SMESHGUI/Makefile.am
patch
|
blob
|
history
src/SMESH_SWIG_WITHIHM/Makefile.am
patch
|
blob
|
history
diff --git
a/src/Controls/Makefile.am
b/src/Controls/Makefile.am
index 0dd516e946bdda88f5cf355c50054aab1f0674b0..90707cadbcf47910f1c4a13bc2b0419cc0a93acb 100644
(file)
--- a/
src/Controls/Makefile.am
+++ b/
src/Controls/Makefile.am
@@
-53,7
+53,7
@@
libSMESHControls_la_CPPFLAGS = \
libSMESHControls_la_LDFLAGS = \
../SMDS/libSMDS.la \
../SMESHDS/libSMESHDS.la \
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)
SMESHControls_CPPFLAGS = \
$(libSMESHControls_la_CPPFLAGS)
diff --git
a/src/Driver/Makefile.am
b/src/Driver/Makefile.am
index 0534f2a573df9cf2ada916cfbca25b89d32748f9..70b7a2bc03ca096acb915889bd62742a3e46e3d5 100644
(file)
--- a/
src/Driver/Makefile.am
+++ b/
src/Driver/Makefile.am
@@
-53,4
+53,4
@@
libMeshDriver_la_CPPFLAGS = \
libMeshDriver_la_LDFLAGS = \
../SMESHDS/libSMESHDS.la \
$(KERNEL_LDFLAGS) -lOpUtil \
libMeshDriver_la_LDFLAGS = \
../SMESHDS/libSMESHDS.la \
$(KERNEL_LDFLAGS) -lOpUtil \
- $(CAS_LDPATH) -TKernel -lTKTopAlgo
+ $(CAS_LDPATH) -
l
TKernel -lTKTopAlgo
diff --git
a/src/MEFISTO2/Makefile.am
b/src/MEFISTO2/Makefile.am
index 1f0e496964a609a82b6c53cee90899ba52f41f17..b4e94a84011c393ab6217d18581336a213117ce1 100644
(file)
--- a/
src/MEFISTO2/Makefile.am
+++ b/
src/MEFISTO2/Makefile.am
@@
-43,6
+43,7
@@
libMEFISTO2D_la_CPPFLAGS = \
@PLATFORM_INCLUDES@
libMEFISTO2D_la_LDFLAGS = \
@PLATFORM_INCLUDES@
libMEFISTO2D_la_LDFLAGS = \
+ $(CAS_LDFLAGS) -lTKernel -lTKMath \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
$(FCLIBS)
$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
$(FCLIBS)
diff --git
a/src/OBJECT/Makefile.am
b/src/OBJECT/Makefile.am
index 3bc3907c9ce4da80e83fe12df4a98db9dcb0c8e6..bd233661a84bf813d3273bb3500d0078a16541eb 100644
(file)
--- a/
src/OBJECT/Makefile.am
+++ b/
src/OBJECT/Makefile.am
@@
-57,6
+57,7
@@
libSMESHObject_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \
$(VTK_INCLUDES) \
$(CORBA_INCLUDES) \
$(CAS_CPPFLAGS) \
$(VTK_INCLUDES) \
$(CORBA_INCLUDES) \
+ $(CORBA_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(QT_INCLUDES) \
-I$(srcdir)/../Controls \
$(BOOST_CPPFLAGS) \
$(QT_INCLUDES) \
-I$(srcdir)/../Controls \
@@
-73,6
+74,6
@@
libSMESHObject_la_LDFLAGS = \
../SMESHClient/libSMESHClient.la \
../SMDS/libSMDS.la \
../Controls/libSMESHControls.la \
../SMESHClient/libSMESHClient.la \
../SMDS/libSMDS.la \
../Controls/libSMESHControls.la \
- $(GUI_LDFLAGS) -lSalomeApp
lSalomeObjec
t \
+ $(GUI_LDFLAGS) -lSalomeApp
-lSalomeObject -lSVTK -lVTKViewer -lqtx -lsui
t \
$(CAS_KERNEL) \
$(CAS_KERNEL) \
- $(VTK_LIBS)
+ $(VTK_LIBS)
$(QT_MT_LIBS)
diff --git
a/src/SMESH/Makefile.am
b/src/SMESH/Makefile.am
index 2905cc92bec9cb0e5b81f7f7c78515004437671b..ce65291a351b129c6a21b7237b76e87d1cda5cad 100644
(file)
--- a/
src/SMESH/Makefile.am
+++ b/
src/SMESH/Makefile.am
@@
-106,4
+106,4
@@
libSMESHimpl_la_LDFLAGS = \
../DriverMED/libMeshDriverMED.la \
../DriverUNV/libMeshDriverUNV.la \
$(GEOM_LDFLAGS) -lNMTTools \
../DriverMED/libMeshDriverMED.la \
../DriverUNV/libMeshDriverUNV.la \
$(GEOM_LDFLAGS) -lNMTTools \
- $(CAS_LDPATH) -lTKShHealing
+ $(CAS_LDPATH) -lTKShHealing
-lTKPrim -lTKG2d
diff --git
a/src/SMESHClient/Makefile.am
b/src/SMESHClient/Makefile.am
index ebb0d97f770ebb4bf6f5951d30382550a45388f8..e44db75f28e013f8a560e2bf40f363da2f09469b 100644
(file)
--- a/
src/SMESHClient/Makefile.am
+++ b/
src/SMESHClient/Makefile.am
@@
-68,7
+68,7
@@
libSMESHClient_la_LDFLAGS = \
../SMESH/libSMESHimpl.la \
../SMESHDS/libSMESHDS.la \
../Controls/libSMESHControls.la \
../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)
$(GEOM_LDFLAGS) -lNMTDS \
$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 \
$(CAS_KERNEL)
diff --git
a/src/SMESHFiltersSelection/Makefile.am
b/src/SMESHFiltersSelection/Makefile.am
index 183083cc7e644211a0fa3421ee72041c46e04106..a0d49e885d71994cf68d375cc08ad613df02672c 100644
(file)
--- a/
src/SMESHFiltersSelection/Makefile.am
+++ b/
src/SMESHFiltersSelection/Makefile.am
@@
-63,6
+63,7
@@
libSMESHFiltersSelection_la_CPPFLAGS = \
libSMESHFiltersSelection_la_LDFLAGS = \
../../idl/libSalomeIDLSMESH.la \
$(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \
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)
diff --git
a/src/SMESHGUI/Makefile.am
b/src/SMESHGUI/Makefile.am
index db288673a8023989a9e19e1f35b078d20749f0b5..bd8db3b6b9cc3a47b80bc5e35cf27abc38c078cb 100644
(file)
--- a/
src/SMESHGUI/Makefile.am
+++ b/
src/SMESHGUI/Makefile.am
@@
-246,8
+246,9
@@
libSMESH_la_LDFLAGS = \
../SMDS/libSMDS.la \
../Controls/libSMESHControls.la \
../OBJECT/libSMESHObject.la \
../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= \
# resources files
nodist_salomeres_DATA= \
diff --git
a/src/SMESH_SWIG_WITHIHM/Makefile.am
b/src/SMESH_SWIG_WITHIHM/Makefile.am
index 69ae00da9e2199edeaeb9edbbc3ffaa0cc9f50bb..e540dd1ab7e959a729f5ac756c01842e5787ec4f 100644
(file)
--- a/
src/SMESH_SWIG_WITHIHM/Makefile.am
+++ b/
src/SMESH_SWIG_WITHIHM/Makefile.am
@@
-71,6
+71,7
@@
_libSMESH_Swig_la_CPPFLAGS = \
$(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \
$(BOOST_CPPFLAGS) \
$(CORBA_CXXFLAGS) \
$(CORBA_INCLUDES) \
$(BOOST_CPPFLAGS) \
+ -I$(srcdir) \
-I$(srcdir)/../SMESHGUI \
-I$(top_builddir)/idl \
-I$(top_builddir)/salome_adm/unix
-I$(srcdir)/../SMESHGUI \
-I$(top_builddir)/idl \
-I$(top_builddir)/salome_adm/unix