Build with native prerequsites

This commit is contained in:
rnv 2020-06-22 14:05:18 +03:00 committed by YOANN AUDOUIN
parent 80a99b5d23
commit 4da74bc198
10 changed files with 20 additions and 1 deletions

View File

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

View File

@ -47,6 +47,8 @@
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
#include <QButtonGroup>
//================================================================================= //=================================================================================
// class : BasicGUI_CurveDlg() // class : BasicGUI_CurveDlg()
// purpose : Constructs a BasicGUI_CurveDlg which is a child of 'parent', with the // purpose : Constructs a BasicGUI_CurveDlg which is a child of 'parent', with the

View File

@ -72,6 +72,8 @@
#include <Graphic3d_AspectText3d.hxx> #include <Graphic3d_AspectText3d.hxx>
#include <Font_FontAspect.hxx> #include <Font_FontAspect.hxx>
#include <QButtonGroup>
// This include must be *AFTER* SOCC_ViewModel.h because // This include must be *AFTER* SOCC_ViewModel.h because
// of the constant ROTATE which is a #define in // of the constant ROTATE which is a #define in
// GEOMImpl_Types.hxx and an enum in SOCC_ViewModel.h // GEOMImpl_Types.hxx and an enum in SOCC_ViewModel.h

View File

@ -30,6 +30,8 @@
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <QButtonGroup>
//================================================================================= //=================================================================================
// class : EntityGUI_IsolineDlg // class : EntityGUI_IsolineDlg

View File

@ -52,6 +52,7 @@
#include <DlgRef.h> #include <DlgRef.h>
#include <QKeyEvent> #include <QKeyEvent>
#include <QButtonGroup>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>

View File

@ -44,6 +44,7 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QSpinBox> #include <QSpinBox>
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include <QButtonGroup>
//================================================================================= //=================================================================================
// class : GEOMBase_Skeleton() // class : GEOMBase_Skeleton()

View File

@ -61,6 +61,7 @@
#include <QListWidget> #include <QListWidget>
#include <QLineEdit> #include <QLineEdit>
#include <QMap> #include <QMap>
#include <QButtonGroup>
#include <AIS_ListOfInteractive.hxx> #include <AIS_ListOfInteractive.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx> #include <AIS_ListIteratorOfListOfInteractive.hxx>

View File

@ -50,6 +50,8 @@
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <QButtonGroup>
#include <Aspect_PolygonOffsetMode.hxx> #include <Aspect_PolygonOffsetMode.hxx>
#include <Basics_OCCTVersion.hxx> #include <Basics_OCCTVersion.hxx>

View File

@ -41,6 +41,8 @@
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <TColStd_IndexedMapOfInteger.hxx>
#include <QButtonGroup>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
//================================================================================= //=================================================================================

View File

@ -55,6 +55,8 @@
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <QButtonGroup>
enum { BY_PARAM, BY_POINT_PROJ }; enum { BY_PARAM, BY_POINT_PROJ };
//================================================================================= //=================================================================================