From 70873f2715c4fa92bcf85a93fdfd2510bb94e772 Mon Sep 17 00:00:00 2001 From: ouv Date: Mon, 4 Dec 2017 14:46:45 +0300 Subject: [PATCH] Removed dependency on boost. --- adm_local/win32/Plot3d.vcproj | 8 ++++---- adm_local/win32/SPlot2d.vcproj | 8 ++++---- adm_local/win32/SVTK.vcproj | 8 ++++---- src/Plot3d/Makefile.am | 1 - src/SPlot2d/Makefile.am | 4 ++-- src/SPlot2d/SPlot2d.pro | 4 +--- src/SVTK/Makefile.am | 1 - src/SVTK/SVTK.pro | 4 +--- 8 files changed, 16 insertions(+), 22 deletions(-) diff --git a/adm_local/win32/Plot3d.vcproj b/adm_local/win32/Plot3d.vcproj index 1d4c141f4..49e40cf75 100644 --- 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 cd4717bc5..61f19160f 100644 --- 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 784a2aef8..433d95e0b 100644 --- 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 ed1a2e047..fe4043f7a 100644 --- 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 b2dc3f6a5..f4979c319 100644 --- 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 4e6d41e6a..f3816f8fa 100644 --- 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 1d41ba492..8c86a8d52 100755 --- 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 2713f0d59..15133eb28 100644 --- 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 -- 2.39.2