From: rnv Date: Mon, 22 Jun 2020 11:05:18 +0000 (+0300) Subject: Build with native prerequsites X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frnv%2Fnative_build;p=modules%2Fgeom.git Build with native prerequsites --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fd0bf212..816d776d8 100644 --- 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 7b193f974..301aaf37e 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.cxx +++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx @@ -47,6 +47,8 @@ #include +#include + //================================================================================= // 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 74abede30..fcd9cdee9 100644 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -72,6 +72,8 @@ #include #include +#include + // 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 f105c3ed9..1e662594b 100644 --- a/src/EntityGUI/EntityGUI_IsolineDlg.cxx +++ b/src/EntityGUI/EntityGUI_IsolineDlg.cxx @@ -30,6 +30,8 @@ #include #include +#include + //================================================================================= // class : EntityGUI_IsolineDlg diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 1011d2e20..1155185ed 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -52,6 +52,7 @@ #include #include +#include #include #include diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx index 342134964..cde8d2fc6 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.cxx +++ b/src/GEOMBase/GEOMBase_Skeleton.cxx @@ -44,6 +44,7 @@ #include #include #include +#include //================================================================================= // class : GEOMBase_Skeleton() diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index 6f8f529ea..fc18f87c1 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -61,6 +61,7 @@ #include #include #include +#include #include #include diff --git a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx index bcccbf157..6779e5a41 100644 --- a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx @@ -50,6 +50,8 @@ #include #include +#include + #include #include diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx index 837e6bb6d..47c0337aa 100644 --- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx +++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx @@ -41,6 +41,8 @@ #include #include +#include + #include //================================================================================= diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx index a147d97e5..14e22e968 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx +++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx @@ -55,6 +55,8 @@ #include #include +#include + enum { BY_PARAM, BY_POINT_PROJ }; //=================================================================================