From 51af0ffaeb251224e0603e12a9907c7851c5074d Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Jun 2015 18:47:20 +0300 Subject: [PATCH] Various minor fixes --- CMakeLists.txt | 73 ++++++++++-------- INSTALL | 7 +- README | 6 +- SalomeXTPLUGINConfig.cmake.in | 10 ++- adm_local/cmake_files/FindXT.cmake | 4 +- doc/CMakeLists.txt | 0 doc/salome/CMakeLists.txt | 0 doc/salome/gui/CMakeLists.txt | 0 doc/salome/gui/XTPLUGIN/CMakeLists.txt | 0 doc/salome/gui/XTPLUGIN/doxyfile.in | 0 doc/salome/gui/XTPLUGIN/doxyfile_py.in | 2 +- doc/salome/gui/XTPLUGIN/images/head.png | Bin .../XTPLUGIN/input/xtplugin_import_page.doc | 4 +- .../input/xtplugin_python_interface_page.doc | 6 +- doc/salome/gui/XTPLUGIN/static/footer.html | 0 doc/salome/gui/XTPLUGIN/static/header.html.in | 0 .../gui/XTPLUGIN/static/salome_extra.css | 2 +- idl/CMakeLists.txt | 1 - resources/SalomeApp.xml | 2 +- src/CMakeLists.txt | 3 +- src/XTPlugin_Engine.hxx | 0 src/XTPlugin_GUI.cxx | 2 +- src/XTPlugin_IECallBack.cxx | 1 - src/XTPlugin_ImportDriver.cxx | 3 +- src/XTPlugin_OperationsCreator.hxx | 0 src/resources/XTPlugin_msg_fr.ts | 2 +- src/resources/XTPlugin_msg_ja.ts | 2 +- 27 files changed, 71 insertions(+), 59 deletions(-) mode change 100755 => 100644 doc/CMakeLists.txt mode change 100755 => 100644 doc/salome/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/XTPLUGIN/CMakeLists.txt mode change 100755 => 100644 doc/salome/gui/XTPLUGIN/doxyfile.in mode change 100755 => 100644 doc/salome/gui/XTPLUGIN/doxyfile_py.in mode change 100755 => 100644 doc/salome/gui/XTPLUGIN/images/head.png mode change 100755 => 100644 doc/salome/gui/XTPLUGIN/static/footer.html mode change 100755 => 100644 doc/salome/gui/XTPLUGIN/static/header.html.in mode change 100755 => 100644 idl/CMakeLists.txt mode change 100755 => 100644 src/XTPlugin_Engine.hxx mode change 100755 => 100644 src/XTPlugin_IECallBack.cxx mode change 100755 => 100644 src/XTPlugin_OperationsCreator.hxx diff --git a/CMakeLists.txt b/CMakeLists.txt index 57975d6..5d4aa3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ PROJECT(SalomeXTPLUGIN C CXX) CMAKE_POLICY(SET CMP0003 NEW) # Versioning -# =========== +# ========== # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) @@ -37,16 +37,16 @@ SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Find KERNEL # =========== -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}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") INCLUDE(SalomeMacros) FIND_PACKAGE(SalomeKERNEL REQUIRED) - KERNEL_WITH_CORBA() #check whether KERNEL builded with CORBA + KERNEL_WITH_CORBA() #check whether KERNEL is built with CORBA ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) - MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") + MESSAGE(FATAL_ERROR "We absolutely need a SALOME KERNEL, please define KERNEL_ROOT_DIR") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) # Platform setup @@ -58,55 +58,55 @@ SET(BUILD_SHARED_LIBS TRUE) LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # Find GEOM -# =========== -SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM") +# ========= +SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the SALOME Geometry") IF(EXISTS ${GEOM_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGEOM REQUIRED) ADD_DEFINITIONS(${GEOM_DEFINITIONS}) INCLUDE_DIRECTORIES(${GEOM_INCLUDE_DIRS}) ELSE(EXISTS ${GEOM_ROOT_DIR}) - MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR") + MESSAGE(FATAL_ERROR "We absolutely need a SALOME Geometry, please define GEOM_ROOT_DIR") ENDIF(EXISTS ${GEOM_ROOT_DIR}) -SET(SALOME_BUILD_GUI ${SALOME_GEOM_BUILD_GUI}) +# User options +# ============ +OPTION(SALOME_BUILD_GUI "Enable GUI" ${SALOME_GEOM_BUILD_GUI}) +OPTION(SALOME_BUILD_DOC "Generate SALOME XTPLUGIN documentation" ON) +OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) +OPTION(XT_READ_LICENSE "OCCT Parasolid read license key" "") -# Find GUI(optional) +# Find GUI (optional) +# =================== IF(SALOME_BUILD_GUI) - SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") + SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the SALOME GUI") IF(EXISTS ${GUI_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI) - FULL_GUI(FALSE) #check whether GUI builded in full mode and with CORBA + FULL_GUI(FALSE) ADD_DEFINITIONS(${GUI_DEFINITIONS}) INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS}) ELSE(EXISTS ${GUI_ROOT_DIR}) - MESSAGE(STATUS "GUI_ROOT_DIR is not well defined, XTPLUGIN will be built without GUI!!!") + MESSAGE(FATAL_ERROR "We absolutely need a SALOME GUI, please define GUI_ROOT_DIR") ENDIF(EXISTS ${GUI_ROOT_DIR}) + IF(NOT SALOME_GEOM_BUILD_GUI) + MESSAGE(FATAL_ERROR "SALOME Geometry module is built without GUI") + ENDIF(NOT SALOME_GEOM_BUILD_GUI) SALOME_LOG_OPTIONAL_PACKAGE(SalomeGUI SALOME_BUILD_GUI) ENDIF(SALOME_BUILD_GUI) -# User options -# ============ -OPTION(SALOME_BUILD_DOC "Generate SALOME XTPLUGIN documentation" ON) -OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) - IF(SALOME_BUILD_TESTS) ENABLE_TESTING() -ENDIF() - -OPTION(XT_READ_LICENSE "XT read license key" "") +ENDIF(SALOME_BUILD_TESTS) IF(XT_READ_LICENSE) ADD_DEFINITIONS(-DXT_HASLICENSE) -ELSE() - MESSAGE(WARNING "XT read license key is not specified! Runtime license will be required!") -ENDIF() - -## -## XTPLUGIN specifics -## +ELSE(XT_READ_LICENSE) + MESSAGE(WARNING "OCCT Parasolid read license key is not specified! Runtime license will be required!") +ENDIF(XT_READ_LICENSE) +# Pre-requisites +# ============== FIND_PACKAGE(SalomePython REQUIRED) FIND_PACKAGE(SalomeCAS REQUIRED) FIND_PACKAGE(SalomeXT REQUIRED) @@ -114,16 +114,20 @@ FIND_PACKAGE(SalomeOmniORB REQUIRED) FIND_PACKAGE(SalomeOmniORBPy REQUIRED) IF(SALOME_BUILD_GUI) FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) -ENDIF() +ENDIF(SALOME_BUILD_GUI) IF(SALOME_BUILD_DOC) FIND_PACKAGE(SalomeDoxygen) SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) -ENDIF() +ENDIF(SALOME_BUILD_DOC) + +# Detection summary: +SALOME_PACKAGE_REPORT_AND_CHECK() # Directories # =========== SET(SALOME_INSTALL_BINS bin/salome CACHE PATH "Install path: SALOME binaries") SET(SALOME_INSTALL_LIBS lib/salome CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_IDLS idl/salome CACHE PATH "Install path: SALOME IDL files") SET(SALOME_INSTALL_HEADERS include/salome CACHE PATH "Install path: SALOME headers") SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH "Install path: local SALOME CMake files") @@ -135,22 +139,23 @@ SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: S SET(SALOME_XTPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/xtplugin" CACHE PATH. "Install path: SALOME XTPLUGIN specific data") -MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_HEADERS) +MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_DOC) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_XTPLUGIN_INSTALL_RES_DATA) # Accumulate environment variables for XTPLUGIN module SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) # Sources -# ======== +# ======= ADD_SUBDIRECTORY(idl) ADD_SUBDIRECTORY(adm_local) ADD_SUBDIRECTORY(resources) ADD_SUBDIRECTORY(src) IF(SALOME_BUILD_DOC) ADD_SUBDIRECTORY(doc) -ENDIF() +ENDIF(SALOME_BUILD_DOC) # Header configuration # ==================== @@ -172,7 +177,7 @@ IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets XTPluginGUI ) -ENDIF() +ENDIF(SALOME_BUILD_GUI) # Add all targets to the build-tree export set EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} @@ -199,7 +204,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} COMPATIBILITY AnyNewerVersion) - + # Install the CMake configuration files: INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" diff --git a/INSTALL b/INSTALL index 8f4e78c..389b76a 100644 --- a/INSTALL +++ b/INSTALL @@ -26,9 +26,10 @@ Pre-requisites XT plugin for SALOME Geometry module requires: -- SALOME, at least KERNEL module (http://www.salome-platform.org). +- SALOME, at least KERNEL and GEOM modules (http://www.salome-platform.org). - Open CASCADE Technology and OCCT Parasolid Import XDE product (http://www.opencascade.org). +- Other pre-requisite products, according to the SALOME pre-requisites list. ================== Basic Installation @@ -58,12 +59,12 @@ In order to build the plugin you have to do the following actions: - for csh: - % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.7.0 + % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.9.0 % setenv LD_LIBRARY_PATH ${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} - for bash: - % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.7.0 + % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.9.0 % export LD_LIBRARY_PATH=${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} 2. Create a build directory (in the example below, it is assumed diff --git a/README b/README index 701ae14..b0e5aff 100644 --- a/README +++ b/README @@ -73,15 +73,15 @@ Usage - for csh: - % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.7.0 + % setenv OCCLICENSE_ROOT_DIR /path/to/the/OCCLicense-6.9.0 % setenv LD_LIBRARY_PATH ${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} - for bash: - % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.7.0 + % export OCCLICENSE_ROOT_DIR=/path/to/the/OCCLicense-6.9.0 % export LD_LIBRARY_PATH=${OCCLICENSE_ROOT_DIR}/lib:${LD_LIBRARY_PATH} -2. Using in SALOME +2. Usage in SALOME * Run SALOME and activate Geometry module. diff --git a/SalomeXTPLUGINConfig.cmake.in b/SalomeXTPLUGINConfig.cmake.in index 2428960..4ae3d31 100644 --- a/SalomeXTPLUGINConfig.cmake.in +++ b/SalomeXTPLUGINConfig.cmake.in @@ -1,5 +1,6 @@ # Config file for the @PROJECT_NAME@ package # It defines the following variables: +# Specific to the pacakge @PROJECT_NAME@ itself: # @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file # @@ -39,7 +40,6 @@ SET_AND_CHECK(XTPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") # Include directories SET_AND_CHECK(XTPLUGIN_INCLUDE_DIRS "${XTPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") SET(XTPLUGIN_INCLUDE_DIRS "${XTPLUGIN_INCLUDE_DIRS};@_SalomeXTPLUGIN_EXTRA_HEADERS@") -SET(XTPLUGIN_DEFINITIONS) # Package specific environment variables @_SalomeXTPLUGIN_EXTRA_ENV_FULL@ @@ -49,6 +49,7 @@ SET(XTPLUGIN_DEFINITIONS) # Options exported by the package: SET(SALOME_XTPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) SET(SALOME_XTPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_XTPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@) # Level 1 prerequisites: SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") @@ -90,10 +91,17 @@ ENDIF() # Installation directories SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") +SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@") SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") + +# Include GEOM targets if they were not already loaded: +IF(NOT (TARGET GEOMEngine)) + INCLUDE("${GEOM_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeGEOMTargets.cmake") +ENDIF() # Exposed XTPLUGIN targets: SET(XTPLUGIN_SalomeIDLXTPlugin SalomeIDLXTPlugin) diff --git a/adm_local/cmake_files/FindXT.cmake b/adm_local/cmake_files/FindXT.cmake index 469ad44..b602334 100644 --- a/adm_local/cmake_files/FindXT.cmake +++ b/adm_local/cmake_files/FindXT.cmake @@ -1,7 +1,7 @@ # - Find OCCT Parasolid XDE product # Sets the following variables: -# XT_INCLUDE_DIRS - path to the XT include directory -# XT_LIBRARIES - path to the XT libraries to be linked against +# XT_INCLUDE_DIRS - path to the OCCT Parasolid XDE include directory +# XT_LIBRARIES - OCCT Parasolid XDE libraries to be linked against # ######################################################################### diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/gui/XTPLUGIN/CMakeLists.txt b/doc/salome/gui/XTPLUGIN/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/doc/salome/gui/XTPLUGIN/doxyfile.in b/doc/salome/gui/XTPLUGIN/doxyfile.in old mode 100755 new mode 100644 diff --git a/doc/salome/gui/XTPLUGIN/doxyfile_py.in b/doc/salome/gui/XTPLUGIN/doxyfile_py.in old mode 100755 new mode 100644 index 5dfead6..0b353e2 --- a/doc/salome/gui/XTPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/XTPLUGIN/doxyfile_py.in @@ -96,7 +96,7 @@ EXAMPLE_RECURSIVE = NO #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = tmp @CMAKE_SOURCE_DIR@/idl/XTPlugin_Gen.idl +INPUT = tmp @CMAKE_SOURCE_DIR@/idl/XTPlugin.idl FILE_PATTERNS = IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images RECURSIVE = NO diff --git a/doc/salome/gui/XTPLUGIN/images/head.png b/doc/salome/gui/XTPLUGIN/images/head.png old mode 100755 new mode 100644 diff --git a/doc/salome/gui/XTPLUGIN/input/xtplugin_import_page.doc b/doc/salome/gui/XTPLUGIN/input/xtplugin_import_page.doc index 6991a2d..2be2ab2 100644 --- a/doc/salome/gui/XTPLUGIN/input/xtplugin_import_page.doc +++ b/doc/salome/gui/XTPLUGIN/input/xtplugin_import_page.doc @@ -6,7 +6,7 @@ To use XTPLUGIN functionalities in SALOME: - Run SALOME and activate Geometry module. -- Import the XT file from menu File/Import/XT. +- Import the XT file from menu \b File - \b Import - \b XT. \image html import_xt.png @@ -14,7 +14,7 @@ To use XTPLUGIN functionalities in SALOME: will appear in the SALOME object browser. \note It is possible to re-load a previously imported shape from the initial file if - the file has been changed on disk. For this, select Reload From Disk item + the file has been changed on disk. To do this, select Reload From Disk item in the Object browser's context menu of the imported shape. The reloaded shape will have the same representation parameters as before this operation. diff --git a/doc/salome/gui/XTPLUGIN/input/xtplugin_python_interface_page.doc b/doc/salome/gui/XTPLUGIN/input/xtplugin_python_interface_page.doc index 0768a93..5067ab1 100644 --- a/doc/salome/gui/XTPLUGIN/input/xtplugin_python_interface_page.doc +++ b/doc/salome/gui/XTPLUGIN/input/xtplugin_python_interface_page.doc @@ -5,15 +5,13 @@ Python package XTPluginBuilder defines a function that allows importing CAD models in Parasolid format (*.x_t and *.xt files). -XTPLUGIN dynamically adds several methods to the geomBuilder. +XTPLUGIN dynamically adds this method to the geomBuilder. Below you can see an example of usage of the XTPluginBuilder package for importing CAD models: \anchor example_XTPlugin -

Example of importing of CAD model stored in Parasolid format (*.x_t and *.xt files) with XTPLUGIN:

+

Example: importing CAD model stored in Parasolid format (*.x_t and *.xt files) with XTPLUGIN:

\tui_script{XTPlugindemo.py} */ - - diff --git a/doc/salome/gui/XTPLUGIN/static/footer.html b/doc/salome/gui/XTPLUGIN/static/footer.html old mode 100755 new mode 100644 diff --git a/doc/salome/gui/XTPLUGIN/static/header.html.in b/doc/salome/gui/XTPLUGIN/static/header.html.in old mode 100755 new mode 100644 diff --git a/doc/salome/gui/XTPLUGIN/static/salome_extra.css b/doc/salome/gui/XTPLUGIN/static/salome_extra.css index 3e8b838..802088e 100644 --- a/doc/salome/gui/XTPLUGIN/static/salome_extra.css +++ b/doc/salome/gui/XTPLUGIN/static/salome_extra.css @@ -26,4 +26,4 @@ div.version { .navpath li.footer { line-height:15px; text-align: right; -} \ No newline at end of file +} diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt old mode 100755 new mode 100644 index 001cd36..35aa622 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -37,7 +37,6 @@ SET(SalomeIDLXTPlugin_IDLSOURCES SET(IDL_INCLUDE_DIRS ${KERNEL_ROOT_DIR}/idl/salome ${GEOM_ROOT_DIR}/idl/salome - ${CMAKE_CURRENT_SOURCE_DIR} ) SET(IDL_LINK_FLAGS ${KERNEL_SalomeIDLKernel} diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index 2187f1f..c48176a 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -4,7 +4,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2.1 of the License. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e00206..b58321f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,15 +29,16 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${XT_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/idl + ${CMAKE_CURRENT_BINARY_DIR} ) IF(SALOME_BUILD_GUI) INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} - ${GEOM_INCLUDE_DIRS} ) ENDIF() diff --git a/src/XTPlugin_Engine.hxx b/src/XTPlugin_Engine.hxx old mode 100755 new mode 100644 diff --git a/src/XTPlugin_GUI.cxx b/src/XTPlugin_GUI.cxx index 11057cf..c977c56 100644 --- a/src/XTPlugin_GUI.cxx +++ b/src/XTPlugin_GUI.cxx @@ -172,7 +172,7 @@ bool XTPlugin_GUI::importXT( SUIT_Desktop* parent ) extern "C" { #ifdef WIN32 - __declspec( dllexport ) + __declspec( dllexport ) #endif GEOMGUI* GetLibGUI( GeometryGUI* parent ) { diff --git a/src/XTPlugin_IECallBack.cxx b/src/XTPlugin_IECallBack.cxx old mode 100755 new mode 100644 index 5088796..006bd0f --- a/src/XTPlugin_IECallBack.cxx +++ b/src/XTPlugin_IECallBack.cxx @@ -53,4 +53,3 @@ XTPlugin_IECallBack::Import( int theDocId, XTPlugin_IOperations* aPluginOperations = XTPlugin_OperationsCreator::get( GetEngine(), theDocId ); return aPluginOperations->ImportXT( theFileName ); } - diff --git a/src/XTPlugin_ImportDriver.cxx b/src/XTPlugin_ImportDriver.cxx index dbdb02d..4ff57d4 100644 --- a/src/XTPlugin_ImportDriver.cxx +++ b/src/XTPlugin_ImportDriver.cxx @@ -56,6 +56,7 @@ #include #include +#include #ifdef XT_HASLICENSE #include "XTPlugin_license.h" @@ -104,7 +105,7 @@ Standard_Integer XTPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const OCCLicense_Activate( "XT-R-"OCC_VERSION_STRING, XT_READ_LICENSE); } catch (Standard_LicenseError) { - return aResShape; + return 0; } #endif // XT_HASLICENSE diff --git a/src/XTPlugin_OperationsCreator.hxx b/src/XTPlugin_OperationsCreator.hxx old mode 100755 new mode 100644 diff --git a/src/resources/XTPlugin_msg_fr.ts b/src/resources/XTPlugin_msg_fr.ts index 7f26c29..a6faab5 100644 --- a/src/resources/XTPlugin_msg_fr.ts +++ b/src/resources/XTPlugin_msg_fr.ts @@ -27,4 +27,4 @@ Importer XT - \ No newline at end of file + diff --git a/src/resources/XTPlugin_msg_ja.ts b/src/resources/XTPlugin_msg_ja.ts index 7ce1a44..d7182af 100644 --- a/src/resources/XTPlugin_msg_ja.ts +++ b/src/resources/XTPlugin_msg_ja.ts @@ -27,4 +27,4 @@ Import XT - \ No newline at end of file + -- 2.39.2