compatibility windows compilation with cmake

diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am
index 2d364c18e16de2bf9fe09291e0f15a137b23e832..4253ea5a542c846ae9f7578682bc8ddc1730efc3 100644 (file)
--- 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 3a4606f029d3b9475075e2ac80ec7468ef32c1f2..4d3a1e05e308ebd910d24af05eefb57247674bba 100644 (file)
--- 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 4ab7a8b7c3b2f5e7964a761bc9f6288a0e001f44..233b5139af0fc48bd363d704c759a86e2d691891 100644 (file)
--- 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 4f0ddc3716ca7bafbb3591879620a208905f0529..a8d0b6dc8279ba7a3dcc6eec2e1d54ac396b7669 100644 (file)
--- 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 6db3208feb99aacfa836f10ee0d444b7d4899c6c..f66b57921fddb6390a9aa11ec458333a93cc0f9a 100644 (file)
--- 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 d84453a4eb02046dd906e00e24e71853ee46d44b..b25fd978871bc10cf4e48e0590b302e4fb9e2edd 100644 (file)
--- 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 9dc50a430245df100cbd7a693771a63b8155d6f3..1d2ffde06b329a1d55d4b2cb15deb4cd8bceb91c 100644 (file)
--- 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 4f879990b88053d0ceec10131c4d0236df5ee79c..d07577bf264ec515ff210b04ad7804872bf5cfa9 100644 (file)
--- 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 4458042064a96507179041ad225df4ffa7bcb5dc..5a6e6caa074fb1f9af7deeb917ca557455a06349 100644 (file)
--- 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 69edb9a10a5ad9fe8eed334583b378f1242e4960..d9fc822cfecda48ced39279086e515bf2699ba94 100644 (file)
--- 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 3e5229249c3499ae62e0437c5e3e2a6382b72c17..ad0ebe94134198566e3b55b79a9818c1b6d3b294 100644 (file)
--- 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 671ab5c4c182155e3f77aa0362073ec8760c6bc2..61afc9eba02b4452280e242a21ce9482a113e14e 100644 (file)
--- 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)