Removed dependency on boost.

diff --git a/adm_local/win32/Plot3d.vcproj b/adm_local/win32/Plot3d.vcproj
index 1d4c141f4d5aaee7da64894bc48e4cb46bba00ce..49e40cf755ec410cc92d84fa1c7360310dbfb743 100644 (file)
--- a/adm_local/win32/Plot3d.vcproj
+++ b/adm_local/win32/Plot3d.vcproj
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/MP"
                                Optimization="0"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;_DEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_USRDLL;PLOT3D_EXPORTS"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -148,7 +148,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/MP"
                                Optimization="0"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;_DEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_OCC64;_USRDLL;PLOT3D_EXPORTS"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -244,7 +244,7 @@
                                AdditionalOptions="/MP"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NDEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_USRDLL;PLOT3D_EXPORTS"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -336,7 +336,7 @@
                                AdditionalOptions="/MP"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NDEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_OCC64;_USRDLL;PLOT3D_EXPORTS"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"

diff --git a/adm_local/win32/SPlot2d.vcproj b/adm_local/win32/SPlot2d.vcproj
index cd4717bc5ad19f5d43f6caeee6756e4ebd5e24d1..61f19160fae4f2e6314d6c4cebe5c87f6c2bdac4 100644 (file)
--- a/adm_local/win32/SPlot2d.vcproj
+++ b/adm_local/win32/SPlot2d.vcproj
@@ -53,7 +53,7 @@
                                AdditionalOptions="/MP"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(BOOSTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NOGDI;NDEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_USRDLL;SPLOT2D_EXPORTS;QT_NO_QT_INCLUDE_WARN"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -145,7 +145,7 @@
                                AdditionalOptions="/MP"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(BOOSTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NOGDI;NDEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_OCC64;_USRDLL;SPLOT2D_EXPORTS;QT_NO_QT_INCLUDE_WARN"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -236,7 +236,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/MP"
                                Optimization="0"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(BOOSTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NOGDI;_DEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_USRDLL;SPLOT2D_EXPORTS;QT_NO_QT_INCLUDE_WARN"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -331,7 +331,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/MP"
                                Optimization="0"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(BOOSTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(OCCINC)";"$(QWTINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NOGDI;_DEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_OCC64;_USRDLL;SPLOT2D_EXPORTS;QT_NO_QT_INCLUDE_WARN"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"

diff --git a/adm_local/win32/SVTK.vcproj b/adm_local/win32/SVTK.vcproj
index 784a2aef846bd9ad391c507c8d86300286a3dbb1..433d95e0b8a53d54aef63bb45c8d1b0c13e90e0b 100644 (file)
--- a/adm_local/win32/SVTK.vcproj
+++ b/adm_local/win32/SVTK.vcproj
@@ -53,7 +53,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/MP"
                                Optimization="0"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;_DEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_USRDLL;SVTK_EXPORTS"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -148,7 +148,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/MP"
                                Optimization="0"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;_DEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_OCC64;_USRDLL;SVTK_EXPORTS"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -244,7 +244,7 @@
                                AdditionalOptions="/MP"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)32\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)32\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NDEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_USRDLL;SVTK_EXPORTS"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -336,7 +336,7 @@
                                AdditionalOptions="/MP"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(BOOSTINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
+                               AdditionalIncludeDirectories=""$(GUI_SRC_DIR)\$(ConfigurationName)64\include";$(QTINC);"$(VTKINC)";"$(OCCINC)";"$(PTHREADSINC)";"$(KERNEL_SRC_DIR)\$(ConfigurationName)64\include";"$(KERNEL_SRC_DIR)\include""
                                PreprocessorDefinitions="DISABLE_QXGRAPHVIEWER;DISABLE_PYCONSOLE;DISABLE_OCCVIEWER;DISABLE_SUPERGRAPHVIEWER;NDEBUG;__x86__;__WIN32__;WNT;WIN32;_WINDOWS;_OCC64;_USRDLL;SVTK_EXPORTS"
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"

diff --git a/src/Plot3d/Makefile.am b/src/Plot3d/Makefile.am
index ed1a2e04761dc405bf6f50daf1b0a45fbd0af825..fe4043f7a581e78526b6c9be7612a20c4c77b7fc 100644 (file)
--- a/src/Plot3d/Makefile.am
+++ b/src/Plot3d/Makefile.am
@@ -74,7 +74,6 @@ libPlot3d_la_CPPFLAGS =               \
        $(QT_INCLUDES)          \
        $(CAS_CPPFLAGS)         \
        $(VTK_INCLUDES)         \
-       $(BOOST_CPPFLAGS)               \
        -I$(srcdir)/../Qtx      \
        -I$(srcdir)/../SUIT     \
        -I$(srcdir)/../OBJECT   \

diff --git a/src/SPlot2d/Makefile.am b/src/SPlot2d/Makefile.am
index b2dc3f6a5b6c642ecfeb57c4eb6bd92a8427b2c8..f4979c319fb8b9adcf736adad46ba1eaa8d7afcb 100644 (file)
--- a/src/SPlot2d/Makefile.am
+++ b/src/SPlot2d/Makefile.am
@@ -39,8 +39,8 @@ MOC_FILES =                           \
        SPlot2d_ViewWindow_moc.cxx
 nodist_libSPlot2d_la_SOURCES = $(MOC_FILES)
 
-libSPlot2d_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(QWT_INCLUDES) $(BOOST_CPPFLAGS)      \
-                        -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Plot2d           \
+libSPlot2d_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(QWT_INCLUDES)        \
+                        -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Plot2d \
                         -I$(srcdir)/../Prs -I$(srcdir)/../OBJECT
 libSPlot2d_la_LDFLAGS  = $(QT_MT_LIBS) $(QWT_LIBS) ../SUIT/libsuit.la ../Plot2d/libPlot2d.la ../Prs/libSalomePrs.la
 

diff --git a/src/SPlot2d/SPlot2d.pro b/src/SPlot2d/SPlot2d.pro
index 4e6d41e6a01863b1328725a2977b4bce0b273f05..f3816f8fa3d1b6421cc8f570895613584c9abc57 100644 (file)
--- a/src/SPlot2d/SPlot2d.pro
+++ b/src/SPlot2d/SPlot2d.pro
@@ -13,9 +13,7 @@ QWTHOME=$$(QWTHOME)
 QWTINC=$${QWTHOME}/include
 QWTLIB=$${QWTHOME}/lib
 
-BOOST_CPPFLAGS = $$(BOOSTDIR)/include
-
-INCLUDEPATH += ../../include $${CAS_CPPFLAGS} ../../include $${QWTINC} $${BOOST_CPPFLAGS}
+INCLUDEPATH += ../../include $${CAS_CPPFLAGS} ../../include $${QWTINC}
 INCLUDEPATH += ../Qtx ../SUIT ../Plot2d ../Prs ../OBJECT
 unix:LIBS  += -L$${QWTLIB} -lqwt
 win32:LIBS += /LIBPATH:$$(QWTLIB)

diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am
index 1d41ba492ab060ce91746dc8d6bdc30225a3862d..8c86a8d52ecd273244e5f537ae950c8fed7672d5 100755 (executable)
--- a/src/SVTK/Makefile.am
+++ b/src/SVTK/Makefile.am
@@ -143,7 +143,6 @@ libSVTK_la_CPPFLAGS =               \
        $(QT_INCLUDES)          \
        $(CAS_CPPFLAGS)         \
        $(VTK_INCLUDES)         \
-       $(BOOST_CPPFLAGS)       \
        -I$(srcdir)/../Qtx      \
        -I$(srcdir)/../SUIT     \
        -I$(srcdir)/../OBJECT   \

diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index 2713f0d597aec380f5e9be4b40b4fdeaab5c36d2..15133eb281b23ea79f0ef178fac119d45ecbe57b 100644 (file)
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -12,11 +12,9 @@ VTK_LIBS = -L$${VTKHOME}/lib/vtk -L$${VTKHOME}/lib/vtk/python -lvtkCommon -lvtkG
 CASROOT = $$(CASROOT)
 CAS_CPPFLAGS = $${CASROOT}/inc
 
-BOOST_CPPFLAGS = $$(BOOSTDIR)/include
-
 OCC_LIBS = 
 
-INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $${VTK_INCLUDES} $${BOOST_CPPFLAGS} ../Qtx ../SUIT ../OBJECT ../Prs ../VTKViewer
+INCLUDEPATH += ../../include $${CAS_CPPFLAGS} $${VTK_INCLUDES} ../Qtx ../SUIT ../OBJECT ../Prs ../VTKViewer
 LIBS += -L../../lib -lqtx -lsuit -lSalomeObject -lSalomePrs -lVTKViewer $${OCC_LIBS} $${VTK_LIBS}
 
 CONFIG -= debug release debug_and_release