Build with native prerequsites

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fd0bf212acef2e95167bff77dfc3fee023ebdba..816d776d8e6602a55d41e112da8e5aab49db057f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
@@ -33,6 +32,7 @@ SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
+
 # Common CMake macros
 # ===================
 SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
@@ -47,7 +47,9 @@ ENDIF()
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
+  #FIND_PACKAGE(SalomeLibXml2 REQUIRED)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
+  #FIND_PACKAGE(SalomeLibXml2 REQUIRED)
   KERNEL_WITH_CORBA() #check whether KERNEL built with CORBA
   ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
   INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
@@ -85,6 +87,7 @@ MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV SALOME_GEOM_USE_VTK)
 ##
 
 # Various
+#FIND_PACKAGE(SalomeLibXml2 REQUIRED)
 FIND_PACKAGE(SalomePythonInterp REQUIRED)
 FIND_PACKAGE(SalomePythonLibs REQUIRED)
 FIND_PACKAGE(SalomePThread REQUIRED)
@@ -92,6 +95,7 @@ FIND_PACKAGE(SalomeSWIG REQUIRED)
 FIND_PACKAGE(SalomeBoost REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
+MESSAGE("!!!!RNV CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
 FIND_PACKAGE(SalomeLibXml2 REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 

diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx
index 7b193f9747ad8f18677b047cbb9fb5c5ae9961b5..301aaf37e796c0c2c64d38c8d44abae45101516b 100644 (file)
--- a/src/BasicGUI/BasicGUI_CurveDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx
@@ -47,6 +47,8 @@
 
 #include <GEOMImpl_Types.hxx>
 
+#include <QButtonGroup>
+
 //=================================================================================
 // class    : BasicGUI_CurveDlg()
 // purpose  : Constructs a BasicGUI_CurveDlg which is a child of 'parent', with the

diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
index 74abede30f252e7225a9101fbf2381d106ad18d3..fcd9cdee9858969378416422c2d79b608ce230f7 100644 (file)
--- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
@@ -72,6 +72,8 @@
 #include <Graphic3d_AspectText3d.hxx>
 #include <Font_FontAspect.hxx>
 
+#include <QButtonGroup>
+
 // This include must be *AFTER* SOCC_ViewModel.h because
 // of the constant ROTATE which is a #define in
 // GEOMImpl_Types.hxx and an enum in SOCC_ViewModel.h

diff --git a/src/EntityGUI/EntityGUI_IsolineDlg.cxx b/src/EntityGUI/EntityGUI_IsolineDlg.cxx
index f105c3ed9318e0704b9613c2cae349e8c7ae069b..1e662594b8651b0edcd642dade0535072462fc3f 100644 (file)
--- a/src/EntityGUI/EntityGUI_IsolineDlg.cxx
+++ b/src/EntityGUI/EntityGUI_IsolineDlg.cxx
@@ -30,6 +30,8 @@
 #include <SalomeApp_Application.h>
 #include <LightApp_SelectionMgr.h>
 
+#include <QButtonGroup> 
+
 
 //=================================================================================
 // class    : EntityGUI_IsolineDlg

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 1011d2e20e1d20d0f4a5641a701a0398a45c9d93..1155185ed7560367b026c81a62f9fa3b7a1a77c4 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -52,6 +52,7 @@
 #include <DlgRef.h>
 
 #include <QKeyEvent>
+#include <QButtonGroup>
 
 #include <BRep_Tool.hxx>
 #include <TopExp.hxx>

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index 34213496412d236509a81d210c24ab57777b5f94..cde8d2fc61e8eaf8c86305c771b58aee0bb3a877 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -44,6 +44,7 @@
 #include <QKeyEvent>
 #include <QSpinBox>
 #include <QDoubleSpinBox>
+#include <QButtonGroup>
 
 //=================================================================================
 // class    : GEOMBase_Skeleton()

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 6f8f529eaa4609cc41d4bf4e11fb3ed154ea402a..fc18f87c1c2754342a269b2ffad29decd152186a 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -61,6 +61,7 @@
 #include <QListWidget>
 #include <QLineEdit>
 #include <QMap>
+#include <QButtonGroup>
 
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>

diff --git a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx
index bcccbf157a1745d4b78354698ba553381f8fbb5e..6779e5a41203860baf54f1cd004c41825cb1059b 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx
@@ -50,6 +50,8 @@
 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>
 
+#include <QButtonGroup>
+
 #include <Aspect_PolygonOffsetMode.hxx>
 
 #include <Basics_OCCTVersion.hxx>

diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
index 837e6bb6d73d69de2413832f77f1e8edb3eab890..47c0337aa662f78d654092cb85816288db1e90ec 100644 (file)
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
@@ -41,6 +41,8 @@
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 
+#include <QButtonGroup>
+
 #include <GEOMImpl_Types.hxx>
 
 //=================================================================================

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index a147d97e5c55ec6e71449e975c7bb85c46831cc5..14e22e9689e2bf0d90321663dcd9c4bf2b7af88b 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -55,6 +55,8 @@
 #include <TopoDS_Edge.hxx>
 #include <gp_Pnt.hxx>
 
+#include <QButtonGroup>
+
 enum { BY_PARAM, BY_POINT_PROJ };
 
 //=================================================================================