From cac891fab3ae1379976060ec3cf8dcf419a83f4e Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 22 Oct 2013 09:12:53 +0000 Subject: [PATCH] Porting HexoticPLUGIN SALOME module to the CMake build system: initial version. --- CMakeLists.txt | 261 ++++++++++ HexoticPLUGIN_version.h.in | 20 +- Makefile.am | 64 --- SalomeHexoticPLUGINConfig.cmake.in | 116 +++++ doc/Makefile.am => adm_local/CMakeLists.txt | 18 +- .../cmake_files/CMakeLists.txt | 22 +- .../cmake_files/FindHexoticPLUGIN.cmake | 15 +- .../cmake_files/FindSalomeHexoticPLUGIN.cmake | 24 +- build_cmake => adm_local/unix/CMakeLists.txt | 11 +- .../unix/config_files/CMakeLists.txt | 23 +- adm_local/unix/config_files/Makefile.am | 30 -- adm_local/unix/make_common_starter.am | 104 ---- bin/CMakeLists.txt | 20 + bin/VERSION.in | 4 +- build_cmake.bat | 20 - build_configure | 141 ------ clean_configure | 33 -- configure.ac | 463 ------------------ adm_local/Makefile.am => doc/CMakeLists.txt | 14 +- .../Makefile.am => doc/salome/CMakeLists.txt | 15 +- doc/salome/examples/CMakeLists.txt | 3 +- doc/salome/gui/CMakeLists.txt | 23 + doc/salome/gui/HexoticPLUGIN/CMakeLists.txt | 33 +- doc/salome/gui/HexoticPLUGIN/Makefile.am | 74 --- doc/salome/gui/HexoticPLUGIN/doxyfile.in | 14 +- doc/salome/gui/HexoticPLUGIN/doxyfile_py.in | 10 +- .../gui/HexoticPLUGIN/static/header.html.in | 2 +- .../HexoticPLUGIN/static/header_py.html.in | 2 +- idl/CMakeLists.txt | 47 ++ idl/Makefile.am | 124 ----- resources/CMakeLists.txt | 39 ++ resources/Makefile.am | 38 -- src/{Makefile.am => CMakeLists.txt} | 32 +- src/GUI/CMakeLists.txt | 120 +++++ src/GUI/HexoticPluginGUI_HypothesisCreator.h | 2 - src/GUI/Makefile.am | 88 ---- src/GUI/resources/CMakeLists.txt | 33 ++ src/GUI/resources/Makefile.am | 34 -- src/HexoticPlugin/CMakeLists.txt | 118 +++++ src/HexoticPlugin/HexoticPlugin_Hexotic.cxx | 26 - src/HexoticPlugin/HexoticPlugin_Hexotic.hxx | 6 +- src/HexoticPlugin/Makefile.am | 70 --- 42 files changed, 896 insertions(+), 1460 deletions(-) create mode 100755 CMakeLists.txt delete mode 100644 Makefile.am create mode 100644 SalomeHexoticPLUGINConfig.cmake.in rename doc/Makefile.am => adm_local/CMakeLists.txt (77%) mode change 100644 => 100755 rename bin/Makefile.am => adm_local/cmake_files/CMakeLists.txt (65%) mode change 100644 => 100755 rename doc/salome/gui/Makefile.am => adm_local/cmake_files/FindHexoticPLUGIN.cmake (71%) rename doc/salome/examples/Makefile.am => adm_local/cmake_files/FindSalomeHexoticPLUGIN.cmake (68%) rename build_cmake => adm_local/unix/CMakeLists.txt (74%) rename doc/salome/Makefile.am => adm_local/unix/config_files/CMakeLists.txt (73%) mode change 100644 => 100755 delete mode 100644 adm_local/unix/config_files/Makefile.am delete mode 100644 adm_local/unix/make_common_starter.am create mode 100755 bin/CMakeLists.txt delete mode 100644 build_cmake.bat delete mode 100755 build_configure delete mode 100755 clean_configure delete mode 100644 configure.ac rename adm_local/Makefile.am => doc/CMakeLists.txt (76%) mode change 100644 => 100755 rename adm_local/unix/Makefile.am => doc/salome/CMakeLists.txt (76%) mode change 100644 => 100755 create mode 100755 doc/salome/gui/CMakeLists.txt delete mode 100755 doc/salome/gui/HexoticPLUGIN/Makefile.am create mode 100755 idl/CMakeLists.txt delete mode 100644 idl/Makefile.am create mode 100755 resources/CMakeLists.txt delete mode 100644 resources/Makefile.am rename src/{Makefile.am => CMakeLists.txt} (69%) mode change 100644 => 100755 create mode 100644 src/GUI/CMakeLists.txt delete mode 100644 src/GUI/Makefile.am create mode 100755 src/GUI/resources/CMakeLists.txt delete mode 100644 src/GUI/resources/Makefile.am create mode 100644 src/HexoticPlugin/CMakeLists.txt delete mode 100644 src/HexoticPlugin/Makefile.am diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100755 index 0000000..86aa262 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,261 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) +PROJECT(SalomeHexoticPLUGIN C CXX) + +# Ensure a proper linker behavior: +CMAKE_POLICY(SET CMP0003 NEW) + +# Versioning +# =========== +# Project name, upper case +STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) + +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +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 1) + +# Find 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) +ELSE(EXISTS ${KERNEL_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") +ENDIF(EXISTS ${KERNEL_ROOT_DIR}) + +IF(SALOME_LIGHT_ONLY) + MESSAGE(FATAL_ERROR "HexoticPLUGIN module can't be built in Light mode (without CORBA)") +ENDIF() + +# Platform setup +# ============== +INCLUDE(SalomeSetupPlatform) # From KERNEL +# Always build libraries as shared objects: +SET(BUILD_SHARED_LIBS TRUE) +# Local macros: +LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") + +# User options +# (some options have already been defined in KERNEL) +# ============ +#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future +OPTION(SALOME_BUILD_DOC "Generate SALOME HexoticPLUGIN documentation" ${SALOME_BUILD_DOC}) + +# Advanced options: +OPTION(SALOME_BUILD_GUI "Enable HexoticPLUGIN GUI" ON) +MARK_AS_ADVANCED(SALOME_BUILD_GUI) +OPTION(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN "Enable using BLSURFPLUGIN" ON) +MARK_AS_ADVANCED(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) +## +## From KERNEL: +## + +# Various +# Python +FIND_PACKAGE(SalomePython REQUIRED) +# Boost +FIND_PACKAGE(SalomeBoost REQUIRED) +# CORBA +FIND_PACKAGE(SalomeOmniORB REQUIRED) +FIND_PACKAGE(SalomeOmniORBPy REQUIRED) + + +# Other KERNEL optionals: +IF(SALOME_BUILD_DOC) + FIND_PACKAGE(SalomeDoxygen) + SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) +ENDIF() + +# Find GUI (optional) +# =========== +IF(SALOME_BUILD_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) + ELSE(EXISTS ${GUI_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR") + ENDIF(EXISTS ${GUI_ROOT_DIR}) + SALOME_LOG_OPTIONAL_PACKAGE(SalomeGUI SALOME_BUILD_GUI) +ENDIF(SALOME_BUILD_GUI) + +## +## From GUI: +## + +IF(SALOME_BUILD_GUI) + # Qt4 + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) +ENDIF(SALOME_BUILD_GUI) + +# OCCT +FIND_PACKAGE(SalomeCAS REQUIRED) +# VTK +FIND_PACKAGE(SalomeVTK 6.0 REQUIRED) + +# Find GEOM +# =========== + +SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM") +IF(EXISTS ${GEOM_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeGEOM REQUIRED) +ELSE(EXISTS ${GEOM_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR") +ENDIF(EXISTS ${GEOM_ROOT_DIR}) + +# Find SMESH +# =========== + +SET(SMESH_ROOT_DIR $ENV{SMESH_ROOT_DIR} CACHE PATH "Path to the Salome SMESH") +IF(EXISTS ${SMESH_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeSMESH REQUIRED) +ELSE(EXISTS ${SMESH_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR") +ENDIF(EXISTS ${SMESH_ROOT_DIR}) + +# Find BLSURFPLUGIN (optional) +# =========== + +IF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + SET(BLSURFPLUGIN_ROOT_DIR $ENV{BLSURFPLUGIN_ROOT_DIR} CACHE PATH "Path to the Salome BLSURFPLUGIN") + IF(EXISTS ${BLSURFPLUGIN_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${BLSURFPLUGIN_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeBLSURFPLUGIN) + SALOME_LOG_OPTIONAL_PACKAGE(SalomeBLSURFPLUGIN WITH_BLSURFPLUGIN) + + ENDIF(EXISTS ${BLSURFPLUGIN_ROOT_DIR}) + IF(BLSURFPLUGIN_FOUND) + ADD_DEFINITIONS(-DWITH_BLSURFPLUGIN) + ENDIF(BLSURFPLUGIN_FOUND) +ENDIF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + + +# Detection summary: +SALOME_PACKAGE_REPORT_AND_CHECK() + +# Directories +# (default values taken from KERNEL) +# =========== +SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries") +SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_IDLS "${SALOME_INSTALL_IDLS}" CACHE PATH "Install path: SALOME IDL files") +SET(SALOME_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "Install path: SALOME headers") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH + "Install path: SALOME scripts") +SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH + "Install path: SALOME script data") +SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH + "Install path: SALOME Python scripts") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH + "Install path: SALOME application skeleton - scripts") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH + "Install path: SALOME application skeleton - Python") +SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff") +SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH + "Install path: SALOME Python shared modules") +SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH + "Install path: local SALOME CMake files") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH + "Install path: local SALOME config files (obsolete, to be removed)") +SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") +SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") + +# Specific to HexoticPLUGIN: +SET(SALOME_HexoticPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/hexoticplugin" CACHE PATH + "Install path: SALOME HexoticPLUGIN specific data") + +MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) +MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON) +MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) +MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) +MARK_AS_ADVANCED(SALOME_HexoticPLUGIN_INSTALL_RES_DATA) + +# Sources +# ======== + +ADD_SUBDIRECTORY(idl) +ADD_SUBDIRECTORY(adm_local) +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(bin) +IF(SALOME_BUILD_DOC) + ADD_SUBDIRECTORY(doc) +ENDIF(SALOME_BUILD_DOC) + +# Header configuration +# ==================== +SALOME_XVERSION(${PROJECT_NAME}) +SALOME_CONFIGURE_FILE(HexoticPLUGIN_version.h.in HexoticPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS}) + +# Configuration export +# (here only the level 1 prerequisites are exposed) +# ==================== +INCLUDE(CMakePackageConfigHelpers) + +# List of targets in this project we want to make visible to the rest of the world. +# They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup" +SET(_${PROJECT_NAME}_exposed_targets + HexoticEngine SalomeIDLHexoticPLUGIN +) + +IF(SALOME_BUILD_GUI) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + HexoticPluginGUI + ) +ENDIF(SALOME_BUILD_GUI) + +# Add all targets to the build-tree export set +EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} + FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake) + +# Create the configuration files: +# - in the build tree: + +# Ensure the variables are always defined for the configure: +SET(SMESH_ROOT_DIR "${SMESH_ROOT_DIR}") + +SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") +CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in + ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" + PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX + SMESH_ROOT_DIR) + +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" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}") + +# Install the export set for use with the install-tree +INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" + FILE ${PROJECT_NAME}Targets.cmake) diff --git a/HexoticPLUGIN_version.h.in b/HexoticPLUGIN_version.h.in index 0e71a61..ed0b35a 100644 --- a/HexoticPLUGIN_version.h.in +++ b/HexoticPLUGIN_version.h.in @@ -25,12 +25,22 @@ #if !defined(__HEXOTICPLUGIN_VERSION_H__) #define __HEXOTICPLUGIN_VERSION_H__ -/* - HEXOTICPLUGIN_VERSION is (major << 16) + (minor << 8) + patch. +/*! + Specify version of SALOME HexoticPLUGIN module, as follows + + HexoticPLUGIN_VERSION_MAJOR : (integer) number identifying major version + HexoticPLUGIN_VERSION_MINOR : (integer) number identifying minor version + HexoticPLUGIN_VERSION_MAINTENANCE : (integer) number identifying maintenance version + HexoticPLUGIN_VERSION_STR : (string) complete version number "major.minor.maintenance" + HexoticPLUGIN_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + HexoticPLUGIN_DEVELOPMENT : (integer) indicates development version when set to 1 */ -#define HEXOTICPLUGIN_VERSION_STR "@VERSION@" -#define HEXOTICPLUGIN_VERSION @XVERSION@ -#define HEXOTICPLUGIN_DEVELOPMENT @VERSION_DEV@ +#define HexoticPLUGIN_VERSION_MAJOR @SALOMEHexoticPLUGIN_MAJOR_VERSION@ +#define HexoticPLUGIN_VERSION_MINOR @SALOMEHexoticPLUGIN_MINOR_VERSION@ +#define HexoticPLUGIN_VERSION_MAINTENANCE @SALOMEHexoticPLUGIN_PATCH_VERSION@ +#define HexoticPLUGIN_VERSION_STR "@SALOMEHexoticPLUGIN_VERSION@" +#define HexoticPLUGIN_VERSION @SALOMEHexoticPLUGIN_XVERSION@ +#define HexoticPLUGIN_DEVELOPMENT @SALOMEHexoticPLUGIN_VERSION_DEV@ #endif // __HEXOTICPLUGIN_VERSION_H__ diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index ea0dc80..0000000 --- a/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if HEXOTICPLUGIN_ENABLE_GUI - ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files -# -I ${BLSURFPLUGIN_ROOT_DIR}/adm_local/unix/config_files -else !HEXOTICPLUGIN_ENABLE_GUI - ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files -# -I ${BLSURFPLUGIN_ROOT_DIR}/adm_local/unix/config_files -endif - -if HEXOTICPLUGIN_ENABLE_BLSURFPLUGIN - ACLOCAL_AMFLAGS += -I ${BLSURFPLUGIN_ROOT_DIR}/adm_local/unix/config_files -endif - -SUBDIRS = idl adm_local resources src bin doc - -DIST_SUBDIRS = idl adm_local resources src bin doc - -DISTCLEANFILES = a.out aclocal.m4 configure hack_libtool - -salomeinclude_DATA = HexoticPLUGIN_version.h - -EXTRA_DIST += \ - build_configure \ - clean_configure - -dist-hook: - rm -rf `find $(distdir) -name CVS` - -usr_docs: - (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs: usr_docs diff --git a/SalomeHexoticPLUGINConfig.cmake.in b/SalomeHexoticPLUGINConfig.cmake.in new file mode 100644 index 0000000..e32731e --- /dev/null +++ b/SalomeHexoticPLUGINConfig.cmake.in @@ -0,0 +1,116 @@ +# - 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 +# + +############################################################### +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or +# email : webmaster.salome@opencascade.com +############################################################### + +### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: +@PACKAGE_INIT@ + +# Load the dependencies for the libraries of @PROJECT_NAME@ +# (contains definitions for IMPORTED targets). This is only +# imported if we are not built as a subproject (in this case targets are already there) +IF(NOT TARGET HexoticEngine AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(HexoticPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(HexoticPLUGIN_INCLUDE_DIRS "${HexoticPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") + +#### Now the specificities + +# Options exported by the package: +#SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_HEXOTICPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) + + +# Advanced options +SET(SALOME_BUILD_GUI @SALOME_BUILD_GUI@) +SET(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN @SALOME_HEXOTICPLUGIN_USEBLSURFPLUGIN@) + +# Level 1 prerequisites: +IF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + SET_AND_CHECK(BLSURFPLUGIN_ROOT_DIR_EXP "@PACKAGE_BLSURFPLUGIN_ROOT_DIR@") +ELSE(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_BLSURFPLUGIN_ROOT_DIR@") +IF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + + +# For all prerequisites, load the corresponding targets if the package was used +# in CONFIG mode. This ensures dependent projects link correctly +# without having to set LD_LIBRARY_PATH: +SET(_PREREQ) +SET(_PREREQ_CONFIG_DIR) +LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) +# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... +MATH(EXPR _range "${_list_len}-1") +FOREACH(_p RANGE ${_range}) + LIST(GET _PREREQ ${_p} _pkg ) + LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir) + IF(_pkg_dir) + MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") + FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE + PATHS "${_pkg_dir}" + NO_DEFAULT_PATH) + ENDIF() +ENDFOREACH() + +# 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_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") +SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") +SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") +SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") +SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") +SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") + +# Include SMESH or BLSURFPLUGIN targets if they were not already loaded: +IF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + IF(NOT (TARGET BLSURFEngine)) + INCLUDE("${BLSURFPLUGIN_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeBLSURFPLUGINTargets.cmake") + ENDIF() +ELSE(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + IF(NOT (TARGET SMESHEngine)) + INCLUDE("${SMESH_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeSMESHTargets.cmake") + ENDIF() +ENDIF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) + +# Exposed HexoticPLUGIN targets: +SET(HexoticPLUGIN_HexoticEngine HexoticEngine) +SET(HexoticPLUGIN_HexoticPluginGUI HexoticPluginGUI) +SET(HexoticPLUGIN_SalomeIDLHexoticPLUGIN SalomeIDLHexoticPLUGIN) \ No newline at end of file diff --git a/doc/Makefile.am b/adm_local/CMakeLists.txt old mode 100644 new mode 100755 similarity index 77% rename from doc/Makefile.am rename to adm_local/CMakeLists.txt index 40f4a8a..84d97c2 --- a/doc/Makefile.am +++ b/adm_local/CMakeLists.txt @@ -1,5 +1,8 @@ # Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# # 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 @@ -17,16 +20,5 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header$ -# source path -# -SUBDIRS = salome - -usr_docs: - (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs: usr_docs \ No newline at end of file +ADD_SUBDIRECTORY(unix) +ADD_SUBDIRECTORY(cmake_files) diff --git a/bin/Makefile.am b/adm_local/cmake_files/CMakeLists.txt old mode 100644 new mode 100755 similarity index 65% rename from bin/Makefile.am rename to adm_local/cmake_files/CMakeLists.txt index 51604d5..784964b --- a/bin/Makefile.am +++ b/adm_local/cmake_files/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,15 +17,13 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# non-distributed files -nodist_salomescript_DATA = VERSION +# =============================================================== +# Files to be installed +# =============================================================== -# distributed files -dist_salomescript_SCRIPTS = +# These files are data, module or lib files +SET(_adm_data + FindHexoticPLUGIN.cmake + FindSalomeHexoticPLUGIN.cmake +) +INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/doc/salome/gui/Makefile.am b/adm_local/cmake_files/FindHexoticPLUGIN.cmake similarity index 71% rename from doc/salome/gui/Makefile.am rename to adm_local/cmake_files/FindHexoticPLUGIN.cmake index 34663d9..c059717 100644 --- a/doc/salome/gui/Makefile.am +++ b/adm_local/cmake_files/FindHexoticPLUGIN.cmake @@ -16,17 +16,10 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : doc # -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = HexoticPLUGIN -usr_docs: - (cd HexoticPLUGIN && $(MAKE) $(AM_MAKEFLAGS) usr_docs) +SET(HexoticPLUGIN_CXXFLAGS -I${HexoticPLUGIN_ROOT_DIR}/include/salome) -docs: usr_docs +FIND_LIBRARY(HexoticEngine HexoticEngine ${HexoticPLUGIN_ROOT_DIR}/lib/salome) +FIND_LIBRARY(HexoticPluginGUI HexoticPluginGUI ${HexoticPLUGIN_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomeIDLHexoticPLUGIN SalomeIDLHexoticPLUGIN ${HexoticPLUGIN_ROOT_DIR}/lib/salome) diff --git a/doc/salome/examples/Makefile.am b/adm_local/cmake_files/FindSalomeHexoticPLUGIN.cmake similarity index 68% rename from doc/salome/examples/Makefile.am rename to adm_local/cmake_files/FindSalomeHexoticPLUGIN.cmake index 3c58122..bf4beb9 100644 --- a/doc/salome/examples/Makefile.am +++ b/adm_local/cmake_files/FindSalomeHexoticPLUGIN.cmake @@ -16,20 +16,16 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - -# File : Makefile -# Author : Alexander KOVALEV (Open Cascade NN) -# Modified by : -# Module : doc # -include $(top_srcdir)/adm_local/unix/make_common_starter.am -pyexamplesdir = $(docdir)/examples/HexoticPLUGIN +IF(NOT SalomeHexoticPLUGIN_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome HexoticPLUGIN ...") +ENDIF() + +SET(CMAKE_PREFIX_PATH "${HexoticPLUGIN_ROOT_DIR}") + +SALOME_FIND_PACKAGE(SalomeHexoticPLUGIN SalomeHexoticPLUGIN CONFIG) -pyexamples_SCRIPTS = hexoticdemo.py \ - hexoticsubdom1.py \ - hexoticsubdom2.py \ - hexoticsubdom3.py \ - hexoticsubdom4.py - -EXTRA_DIST += $(pyexamples_SCRIPTS) +IF(NOT SalomeHexoticPLUGIN_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome HexoticPLUGIN: ${HexoticPLUGIN_ROOT_DIR}") +ENDIF() diff --git a/build_cmake b/adm_local/unix/CMakeLists.txt similarity index 74% rename from build_cmake rename to adm_local/unix/CMakeLists.txt index 01af0c2..2f895ae 100755 --- a/build_cmake +++ b/adm_local/unix/CMakeLists.txt @@ -1,5 +1,4 @@ -#!/bin/sh -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,10 +17,4 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -CURRENT_DIR=`pwd` -CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` -cd ${CONF_DIR} -python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --hexoticplugin -status=$? -cd ${CURRENT_DIR} -exit $status +ADD_SUBDIRECTORY(config_files) diff --git a/doc/salome/Makefile.am b/adm_local/unix/config_files/CMakeLists.txt old mode 100644 new mode 100755 similarity index 73% rename from doc/salome/Makefile.am rename to adm_local/unix/config_files/CMakeLists.txt index ebdaae8..f4e5aa8 --- a/doc/salome/Makefile.am +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -1,5 +1,8 @@ # Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# # 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 @@ -17,18 +20,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header: -# -SUBDIRS = examples gui -SUBDIRSGUI = gui - -usr_docs: - @@SETX@; for d in $(SUBDIRSGUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; +SET(_m4_data + check_Hexotic.m4 + check_HexoticPLUGIN.m4 + check_BLSURFPLUGIN.m4 +) -docs: usr_docs \ No newline at end of file +INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files) diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am deleted file mode 100644 index 4e79a82..0000000 --- a/adm_local/unix/config_files/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_admlocalm4_DATA = \ - check_Hexotic.m4 \ - check_HexoticPLUGIN.m4 \ - check_BLSURFPLUGIN.m4 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am deleted file mode 100644 index 6a073bf..0000000 --- a/adm_local/unix/make_common_starter.am +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : make_common_starter.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# ============================================================ -# The following is to avoid PACKAGE_... env variable -# redefinition compilation warnings -# ============================================================ -# -AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h - -# ============================================================ -# This file defines the common definitions used in several -# Makefile. This file must be included, if needed, by the file -# Makefile.am. -# ============================================================ -# Standard directory for installation -# -salomeincludedir = $(includedir)/salome -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome -bindir = $(prefix)/bin/salome -salomescriptdir = $(bindir) -salomepythondir = $(pythondir)/salome -salomepyexecdir = $(pyexecdir)/salome - -# Directory for installing idl files -salomeidldir = $(prefix)/idl/salome - -# Directory for installing resource files -salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ - -# Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files - -# Shared modules installation directory -sharedpkgpythondir = $(salomepythondir)/shared_modules - -# Documentation directory -docdir = $(datadir)/doc/salome - -# common rules - -# ============================================================ -# Cmake files wildcard (to add then to the distribution) -# ============================================================ -CMAKEFILES = $(notdir $(wildcard $(srcdir)/CMakeLists.txt)) - -# meta object implementation files generation (moc) -%_moc.cxx: %.h - $(MOC) $< -o $@ - -# translation (*.qm) files generation (lrelease) -%.qm: %.ts - $(LRELEASE) $< -qm $@ - -# resource files generation (qrcc) -qrc_%.cxx: %.qrc - $(QRCC) $< -o $@ -name $(*F) - -# qt forms files generation (uic) -ui_%.h: %.ui - $(UIC) -o $@ $< - -# extra distributed files -EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) \ - $(CMAKEFILES) - -# customize clean operation -mostlyclean-local: - rm -f @builddir@/*_moc.cxx - rm -f @builddir@/*.qm - rm -f @builddir@/ui_*.h - rm -f @builddir@/qrc_*.cxx - -# tests -tests: unittest - -unittest: $(UNIT_TEST_PROG) - @if test "x$(UNIT_TEST_PROG)" != "x"; then \ - $(UNIT_TEST_PROG); \ - fi; diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt new file mode 100755 index 0000000..d220062 --- /dev/null +++ b/bin/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) diff --git a/bin/VERSION.in b/bin/VERSION.in index d872cc8..8691962 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,4 +1,4 @@ -[SALOME HexoticPLUGIN] : @VERSION@ -[DEVELOPMENT] : @VERSION_DEV@ +[SALOME HexoticPLUGIN] : @SALOMEHexoticPLUGIN_VERSION@ +[DEVELOPMENT] : @SALOMEHexoticPLUGIN_VERSION_DEV@ [DESCRIPTION] : DISTENE Hexotic meshing plug-in for SALOME Mesh module diff --git a/build_cmake.bat b/build_cmake.bat deleted file mode 100644 index aa2cbc3..0000000 --- a/build_cmake.bat +++ /dev/null @@ -1,20 +0,0 @@ -@REM Copyright (C) 2007-2013 CEA/DEN, EDF R&D -@REM -@REM This library is free software; you can redistribute it and/or -@REM modify it under the terms of the GNU Lesser General Public -@REM License as published by the Free Software Foundation; either -@REM version 2.1 of the License. -@REM -@REM This library is distributed in the hope that it will be useful, -@REM but WITHOUT ANY WARRANTY; without even the implied warranty of -@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -@REM Lesser General Public License for more details. -@REM -@REM You should have received a copy of the GNU Lesser General Public -@REM License along with this library; if not, write to the Free Software -@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -@REM -@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -@REM - -%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --hexoticplugin diff --git a/build_configure b/build_configure deleted file mode 100755 index c58385d..0000000 --- a/build_configure +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : build_configure -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -ORIG_DIR=`pwd` -CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` - -######################################################################## -# Test if the KERNEL_ROOT_DIR is set correctly - -if test ! -d "${KERNEL_ROOT_DIR}"; then - echo "failed : KERNEL_ROOT_DIR variable is not correct !" - exit -fi - -# Test if the KERNEL_SRC is set correctly - -#if test ! -d "${KERNEL_SRC}"; then -# echo "failed : KERNEL_SRC variable is not correct !" -# exit -#fi - -######################################################################## -# Test if the GEOM_ROOT_DIR is set correctly - -if test ! -d "${GEOM_ROOT_DIR}"; then - echo "failed : GEOM_ROOT_DIR variable is not correct !" - exit -fi - -######################################################################## -# Test if the SMESH_ROOT_DIR is set correctly - -if test ! -d "${SMESH_ROOT_DIR}"; then - echo "failed : SMESH_ROOT_DIR variable is not correct !" - exit -fi - -cd ${CONF_DIR} -ABS_CONF_DIR=`pwd` - -####################################################################### - -# ____________________________________________________________________ -# aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory adm_local/unix/config_files -# and KERNEL config_files directory. -# output: -# aclocal.m4 -# autom4te.cache (directory) -echo "======================================================= aclocal" - -if test -d "${GUI_ROOT_DIR}"; then - if test -d "${BLSURFPLUGIN_ROOT_DIR}"; then - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files \ - -I ${BLSURFPLUGIN_ROOT_DIR}/adm_local/unix/config_files || exit 1 - else - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1 - fi -else - if test -d "${BLSURFPLUGIN_ROOT_DIR}"; then - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files \ - -I ${BLSURFPLUGIN_ROOT_DIR}/adm_local/unix/config_files || exit 1 - else - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1 - fi -fi - -# ____________________________________________________________________ -# libtoolize creates some configuration files (ltmain.sh, -# config.guess and config.sub). It only depends on the libtool -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). -# output: -# adm_local/unix/config_files/config.guess -# adm_local/unix/config_files/config.sub -# adm_local/unix/config_files/ltmain.sh -echo "==================================================== libtoolize" - -libtoolize --force --copy --automake || exit 1 - -# ____________________________________________________________________ -# autoconf creates the configure script from the file configure.ac (or -# configure.in if configure.ac doesn't exist) -# output: -# configure -echo "====================================================== autoconf" - -autoconf - -# ____________________________________________________________________ -# automake creates some scripts used in building process -# (install-sh, missing, ...). It only depends on the automake -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also -# creates the Makefile.in files from the Makefile.am files. -# output: -# adm_local/unix/config_files/compile -# adm_local/unix/config_files/depcomp -# adm_local/unix/config_files/install-sh -# adm_local/unix/config_files/missing -# adm_local/unix/config_files/py-compile -# Makefile.in (from Makefile.am) -echo "====================================================== automake" - -automake --copy --gnu --add-missing diff --git a/clean_configure b/clean_configure deleted file mode 100755 index 11b4ef1..0000000 --- a/clean_configure +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : clean_configure -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -rm -rf autom4te.cache aclocal.m4 configure make_config -find . -name "*~" -print -exec rm {} \; -find . -name "*.pyc" -print -exec rm {} \; - -# ... - -find . -name Makefile.in | xargs rm -f -( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh ltmain.sh missing py-compile ) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 6eb4fc9..0000000 --- a/configure.ac +++ /dev/null @@ -1,463 +0,0 @@ -#!/bin/bash -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : configure.ac -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -AC_INIT([Salome2 Project HexoticPLUGIN module], [7.2.0], [webmaster.salome@opencascade.com], [SalomeHexoticPLUGIN]) -AC_CONFIG_AUX_DIR(adm_local/unix/config_files) -AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([-Wno-portability]) - -XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` -AC_SUBST(XVERSION) -VERSION_DEV=0 -AC_SUBST(VERSION_DEV) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=hexoticplugin -AC_SUBST(MODULE_NAME) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! - -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -echo --------------------------------------------- -echo testing libtool -echo --------------------------------------------- - -dnl first, we set static to no! -dnl if we want it, use --enable-static -AC_ENABLE_STATIC(no) - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -echo -echo --------------------------------------------- -echo testing Fortran -echo --------------------------------------------- -echo - -fortran_ok=no -AC_PROG_F77 -AC_F77_LIBRARY_LDFLAGS -AC_PROG_FC -AC_FC_LIBRARY_LDFLAGS -if test "X$FC" != "X" ; then - fortran_ok=yes -fi - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -dnl -dnl Well we use sstream which is not in gcc pre-2.95.3 -dnl We must test if it exists. If not, add it in include ! -dnl - -AC_CXX_HAVE_SSTREAM - -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - -dnl -dnl --------------------------------------------- -dnl testing MPICH -dnl --------------------------------------------- -dnl - -dnl CHECK_MPICH - -echo -echo --------------------------------------------- -echo testing MPI -echo --------------------------------------------- -echo - -CHECK_MPI - -echo -echo --------------------------------------------- -echo testing LEX \& YACC -echo --------------------------------------------- -echo - -lex_yacc_ok=no -AC_PROG_YACC -AC_PROG_LEX -lex_yacc_ok=yes - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -AM_PATH_PYTHON(2.3) - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing java -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_JAVA - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing mico -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_MICO - -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo - -DEFAULT_ORB=omniORB -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=adm_local/unix/$corba - -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_GUI_MODULE - -gui_ok=no -if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then - gui_ok=yes -fi - -AM_CONDITIONAL(HEXOTICPLUGIN_ENABLE_GUI, [test "${gui_ok}" = "yes"]) - -if test "${SalomeGUI_need}" == "yes"; then - if test "${FullGUI_ok}" != "yes"; then - AC_MSG_WARN(For configure HexoticPLUGIN module necessary full GUI!) - fi -elif test "${SalomeGUI_need}" == "auto"; then - if test "${FullGUI_ok}" != "yes"; then - AC_MSG_WARN(Full GUI not found. Build will be done without GUI!) - fi -elif test "${SalomeGUI_need}" == "no"; then - echo Build without GUI option has been chosen -fi - -if test "${gui_ok}" = "yes"; then - echo - echo --------------------------------------------- - echo testing openGL - echo --------------------------------------------- - echo - - CHECK_OPENGL - - echo - echo --------------------------------------------- - echo testing QT - echo --------------------------------------------- - echo - - CHECK_QT -fi - -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo - -CHECK_VTK - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing Geom -echo --------------------------------------------- -echo - -CHECK_GEOM - -echo -echo --------------------------------------------- -echo Testing SMesh -echo --------------------------------------------- -echo - -CHECK_SMESH - -echo -echo --------------------------------------------- -echo Testing BLSURFPlugin -echo --------------------------------------------- -echo - -CHECK_BLSURFPLUGIN -if test "${BLSURFplugin_ok}" = "yes"; then - AC_DEFINE(WITH_BLSURFPLUGIN) -fi -AM_CONDITIONAL(HEXOTICPLUGIN_ENABLE_BLSURFPLUGIN, [test "${BLSURFplugin_ok}" = "yes"]) - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -#AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) - -if test "${gui_ok}" = "yes"; then - variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok gui_ok" - opt_variables="Hexotic_ok BLSURFplugin_ok" -elif test "${SalomeGUI_need}" != "no"; then - variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok gui_ok" - opt_variables="Hexotic_ok BLSURFplugin_ok" -else - variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok" - opt_variables="Hexotic_ok BLSURFplugin_ok" -fi - -echo -echo --- Mandatory products : -echo - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -echo -echo --- Optional products : -echo - -for var in $opt_variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - - -echo -echo "Default ORB : $DEFAULT_ORB" -echo - -dnl We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -dnl Build with SMESH cancel compute feature -AC_DEFINE(WITH_SMESH_CANCEL_COMPUTE) - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -#AC_OUTPUT_COMMANDS([ \ -# chmod +x ./bin/*; \ -# chmod +x ./bin/salome/*; -#]) - -AC_HACK_LIBTOOL -AC_CONFIG_COMMANDS([hack_libtool],[ -sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ - $(pwd)/hack_libtool \1 \"\$[@]\" \n\ -}\n\ -CC=\"hack_libtool\"%g" libtool -sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool -sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool -sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool -],[]) - -# This list is initiated using autoscan and must be updated manually -# when adding a new file .in to manage. When you execute -# autoscan, the Makefile list is generated in the output file configure.scan. -# This could be helpfull to update de configuration. -AC_OUTPUT([ \ - adm_local/Makefile \ - adm_local/unix/Makefile \ - adm_local/unix/config_files/Makefile \ - bin/VERSION \ - bin/Makefile \ - idl/Makefile \ - resources/Makefile \ - src/Makefile \ - src/HexoticPlugin/Makefile \ - src/GUI/Makefile \ - src/GUI/resources/Makefile \ - HexoticPLUGIN_version.h \ - doc/Makefile \ - doc/salome/Makefile \ - doc/salome/examples/Makefile \ - doc/salome/gui/Makefile \ - doc/salome/gui/HexoticPLUGIN/Makefile \ - doc/salome/gui/HexoticPLUGIN/doxyfile \ - doc/salome/gui/HexoticPLUGIN/doxyfile_py \ - doc/salome/gui/HexoticPLUGIN/static/header.html \ - doc/salome/gui/HexoticPLUGIN/static/header_py.html \ - Makefile \ -]) diff --git a/adm_local/Makefile.am b/doc/CMakeLists.txt old mode 100644 new mode 100755 similarity index 76% rename from adm_local/Makefile.am rename to doc/CMakeLists.txt index 75b948f..cedf656 --- a/adm_local/Makefile.am +++ b/doc/CMakeLists.txt @@ -1,4 +1,7 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,11 +20,4 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = unix +ADD_SUBDIRECTORY(salome) diff --git a/adm_local/unix/Makefile.am b/doc/salome/CMakeLists.txt old mode 100644 new mode 100755 similarity index 76% rename from adm_local/unix/Makefile.am rename to doc/salome/CMakeLists.txt index dd764d0..b5d9cf0 --- a/adm_local/unix/Makefile.am +++ b/doc/salome/CMakeLists.txt @@ -1,4 +1,7 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,11 +20,5 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = config_files +ADD_SUBDIRECTORY(examples) +ADD_SUBDIRECTORY(gui) \ No newline at end of file diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index b4580f6..2b433ad 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -17,6 +17,5 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(docdir ${CMAKE_INSTALL_PREFIX}/share/doc/salome) FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.py") -INSTALL(FILES ${files} DESTINATION ${docdir}/examples/HexoticPLUGIN) +INSTALL(FILES ${files} DESTINATION ${SALOME_INSTALL_DOC}/examples/HexoticPLUGIN) diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt new file mode 100755 index 0000000..a78f682 --- /dev/null +++ b/doc/salome/gui/CMakeLists.txt @@ -0,0 +1,23 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(HexoticPLUGIN) diff --git a/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt b/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt index 407d493..f70a53b 100755 --- a/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/HexoticPLUGIN/CMakeLists.txt @@ -19,23 +19,15 @@ INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) -SET(top_builddir ${CMAKE_BINARY_DIR}) -SET(top_srcdir ${CMAKE_SOURCE_DIR}) -SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR}) -SET(builddir ${CMAKE_CURRENT_BINARY_DIR}) -SET(datadir ${CMAKE_INSTALL_PREFIX}/share) -SET(docdir ${datadir}/doc/salome) -SET(guidocdir ${docdir}/gui/HexoticPLUGIN) - SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) SALOME_CONFIGURE_FILE(doxyfile_py.in doxyfile_py) -SALOME_CONFIGURE_FILE(static/header.html.in ${builddir}/static/header.html) -SALOME_CONFIGURE_FILE(static/header_py.html.in ${builddir}/static/header_py.html) +SALOME_CONFIGURE_FILE(static/header.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header.html) +SALOME_CONFIGURE_FILE(static/header_py.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header_py.html) SET(DOC_SMESH_MeshersList HexoticPLUGIN) SET(f1 "$(SMESH_ROOT_DIR)/bin/salome/collect_mesh_methods.py") SET(f "$ENV{KERNEL_ROOT_DIR}/bin/salome/prepare_generating_doc.py") -IF(WINDOWS) +IF(WIN32) STRING(REPLACE "/" "\\" f ${f}) STRING(REPLACE "/" "\\" f1 ${f1}) STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${OMNIORB_ROOT_USER}/lib/x86_win32\;%PYTHONPATH% @@ -56,7 +48,7 @@ IF(WINDOWS) ") SET(EXT "bat") SET(CALL_STR "call") -ELSE(WINDOWS) +ELSE(WIN32) SET(DOC_PYTHONPATH ${CMAKE_INSTALL_PREFIX}/bin/salome:${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/salome:${SMESH_ROOT_DIR}/bin/salome:${SMESH_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${MED_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${GEOM_ROOT_DIR}/bin/salome:${GEOM_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${KERNEL_ROOT_DIR}/bin/salome:${KERNEL_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome:${OMNIORB_ROOT_USER}/lib/python${PYTHON_VERSION}/site-packages:${OMNIORB_ROOT_USER}/lib64/python${PYTHON_VERSION}/site-packages) SET(DOC_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/lib/salome:${SMESH_ROOT_DIR}/lib/salome:${MED_ROOT_DIR}/lib/salome:${GEOM_ROOT_DIR}/lib/salome:${KERNEL_ROOT_DIR}/lib/salome") SET(SCR "export PYTHONPATH=${DOC_PYTHONPATH}:\${PYTHONPATH} @@ -65,18 +57,21 @@ ELSE(WINDOWS) ") SET(EXT "sh") SET(CALL_STR ".") -ENDIF(WINDOWS) +ENDIF(WIN32) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp_env.${EXT} "${SCR}") -ADD_CUSTOM_TARGET(usr_docs mkdir -p tmp +ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/HexoticPLUGINBuilder.py ${CMAKE_SOURCE_DIR}/src/HexoticPlugin/HexoticPLUGINBuilder.py - COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/smesh_algorithm.py ${SMESH_ROOT_DIR}/lib/python${PYTHON_VERSION}/site-packages/salome/salome/smesh/smesh_algorithm.py + COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp/smesh_algorithm.py ${SMESH_ROOT_DIR}/${SALOME_INSTALL_PYTHON}/salome/smesh/smesh_algorithm.py COMMAND ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/tmp_env.${EXT} && ${PYTHON_EXECUTABLE} ${f1} -d -o tmp/smeshBuilder.py HexoticPLUGIN COMMAND ${DOXYGEN_EXECUTABLE} doxyfile_py COMMAND ${DOXYGEN_EXECUTABLE} doxyfile - COMMAND ${PYTHON_EXECUTABLE} -c "import os, shutil; shutil.rmtree(r'''tmp''')" - COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/HexoticPLUGIN''',True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''',r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/HexoticPLUGIN''', ignore=shutil.ignore_patterns('*usr_docs*', '*CMakeFiles*', '*.cmake', 'doxyfile*', '*.vcproj', 'static', 'Makefile*')); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''',r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/HexoticPLUGIN'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''',r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/HexoticPLUGIN/hexoticpluginpy_doc''')" - VERBATIM - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E remove_directory tmp + VERBATIM + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HexoticPLUGIN DESTINATION ${SALOME_INSTALL_DOC}/gui) +INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HexoticPLUGIN) \ No newline at end of file diff --git a/doc/salome/gui/HexoticPLUGIN/Makefile.am b/doc/salome/gui/HexoticPLUGIN/Makefile.am deleted file mode 100755 index 5a149a0..0000000 --- a/doc/salome/gui/HexoticPLUGIN/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -EXTRA_DIST += images input static/footer.html static/salome_extra.css - -guidocdir = $(docdir)/gui/HexoticPLUGIN -guidoc_DATA = images/head.png - -DOC_PYTHONPATH=$(prefix)/bin/salome:$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(SMESH_ROOT_DIR)/bin/salome:$(SMESH_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(MED_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages -DOC_LD_LIBRARY_PATH=$(prefix)/lib/salome:$(SMESH_ROOT_DIR)/lib/salome:$(MED_ROOT_DIR)/lib/salome:$(GEOM_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome -DOC_SMESH_MeshersList=HexoticPLUGIN - -tmp/smeshBuilder.py: $(top_srcdir)/src/HexoticPlugin/HexoticPLUGINBuilder.py - @mkdir -p tmp && PYTHONPATH=$(DOC_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(DOC_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} SMESH_MeshersList=$(DOC_SMESH_MeshersList) $(PYTHON) $(SMESH_ROOT_DIR)/bin/salome/collect_mesh_methods.py -d -o $@ HexoticPLUGIN - -tmp/HexoticPLUGINBuilder.py: $(top_srcdir)/src/HexoticPlugin/HexoticPLUGINBuilder.py - @mkdir -p tmp && $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py -o $@ $< - -tmp/smesh_algorithm.py : @SMESH_ROOT_DIR@/lib/python@PYTHON_VERSION@/site-packages/salome/salome/smesh/smesh_algorithm.py - @mkdir -p tmp && $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py -o $@ $< - -usr_docs: doxyfile_py doxyfile tmp/smeshBuilder.py tmp/HexoticPLUGINBuilder.py tmp/smesh_algorithm.py - @$(DOXYGEN) doxyfile_py ; \ - $(DOXYGEN) doxyfile - -docs: usr_docs - -clean-local: - @for filen in `find . -maxdepth 1` ; do \ - case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_py ) ;; \ - . | .. | ./static ) ;; \ - *) echo "Removing $${filen}" ; rm -rf $${filen} ;; \ - esac ; \ - done ; - -install-data-local: usr_docs - $(INSTALL) -d $(DESTDIR)$(guidocdir) - @for filen in `find . -maxdepth 1` ; do \ - case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_py ) ;; \ - ./doxyfile.bak | ./doxyfile_py.bak ) ;; \ - . | .. | ./static | ./tmp ) ;; \ - *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(guidocdir) ;; \ - esac ; \ - done ; - cp -rp $(srcdir)/images/head.png $(DESTDIR)$(guidocdir)/hexoticpluginpy_doc/ ; - -uninstall-local: - rm -rf $(DESTDIR)$(guidocdir) - diff --git a/doc/salome/gui/HexoticPLUGIN/doxyfile.in b/doc/salome/gui/HexoticPLUGIN/doxyfile.in index 2dd340a..02c53ab 100755 --- a/doc/salome/gui/HexoticPLUGIN/doxyfile.in +++ b/doc/salome/gui/HexoticPLUGIN/doxyfile.in @@ -21,7 +21,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "SALOME HexoticPLUGIN User's Guide" -OUTPUT_DIRECTORY = . +OUTPUT_DIRECTORY = HexoticPLUGIN CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English TAB_SIZE = 5 @@ -35,20 +35,20 @@ WARNINGS = YES #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = @srcdir@/input +INPUT = @CMAKE_CURRENT_SOURCE_DIR@/input FILE_PATTERNS = *.doc EXCLUDE = -IMAGE_PATH = @srcdir@/images -EXAMPLE_PATH = @top_srcdir@/doc/salome/examples +IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images +EXAMPLE_PATH = @CMAKE_SOURCE_DIR@/doc/salome/examples #--------------------------------------------------------------------------- #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = . -HTML_HEADER = @builddir@/static/header.html -HTML_FOOTER = @srcdir@/static/footer.html -HTML_EXTRA_STYLESHEET = @srcdir@/static/salome_extra.css +HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header.html +HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html +HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in b/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in index 3ae1901..efd79d2 100755 --- a/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in @@ -21,7 +21,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "SALOME HexoticPLUGIN User's Guide" -OUTPUT_DIRECTORY = . +OUTPUT_DIRECTORY = HexoticPLUGIN CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO @@ -100,7 +100,7 @@ INPUT = tmp/HexoticPLUGINBuilder.py \ tmp/smeshBuilder.py \ tmp/smesh_algorithm.py FILE_PATTERNS = -IMAGE_PATH = @srcdir@/images +IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images RECURSIVE = NO EXAMPLE_PATH = @@ -109,9 +109,9 @@ EXAMPLE_PATH = #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = hexoticpluginpy_doc -HTML_HEADER = @builddir@/static/header_py.html -HTML_FOOTER = @srcdir@/static/footer.html -HTML_EXTRA_STYLESHEET = @srcdir@/static/salome_extra.css +HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header_py.html +HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html +HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/gui/HexoticPLUGIN/static/header.html.in b/doc/salome/gui/HexoticPLUGIN/static/header.html.in index cd93290..9a1fdf9 100755 --- a/doc/salome/gui/HexoticPLUGIN/static/header.html.in +++ b/doc/salome/gui/HexoticPLUGIN/static/header.html.in @@ -19,5 +19,5 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMEHexoticPLUGIN_VERSION@
diff --git a/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in b/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in index 7b68cef..5d7b1fe 100644 --- a/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in +++ b/doc/salome/gui/HexoticPLUGIN/static/header_py.html.in @@ -19,6 +19,6 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMEHexoticPLUGIN_VERSION@
diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt new file mode 100755 index 0000000..9ea136f --- /dev/null +++ b/idl/CMakeLists.txt @@ -0,0 +1,47 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseOmniORB) # Provided by KERNEL + +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${SMESH_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl +) + +SET(SalomeIDLHexoticPLUGIN_IDLSOURCES + HexoticPlugin_Algorithm.idl +) + +SET(_idl_include_dirs + ${KERNEL_ROOT_DIR}/idl/salome + ${GEOM_ROOT_DIR}/idl/salome + ${SMESH_ROOT_DIR}/idl/salome +) + +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} + ${GEOM_SalomeIDLGEOM} + ${SMESH_SalomeIDLSMESH} +) + +OMNIORB_ADD_MODULE(SalomeIDLHexoticPLUGIN "${SalomeIDLHexoticPLUGIN_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLHexoticPLUGIN EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/idl/Makefile.am b/idl/Makefile.am deleted file mode 100644 index f851009..0000000 --- a/idl/Makefile.am +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# This Makefile is responsible of generating the client and server -# implementation of IDL interfaces for both C++ and python usage. -# The building process of the C++ files is in charge of each source -# package and then is not manage here. -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -BASEIDL_FILES = HexoticPlugin_Algorithm.idl - -BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) - -# This variable defines the files to be installed -dist_salomeidl_DATA = $(BASEIDL_FILES) - -# GUI idl common library -lib_LTLIBRARIES = libSalomeIDLHexoticPLUGIN.la - -# Sources built from idl files -nodist_libSalomeIDLHexoticPLUGIN_la_SOURCES = HexoticPlugin_AlgorithmSK.cc - -# header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) - -libSalomeIDLHexoticPLUGIN_la_CPPFLAGS =\ - $(KERNEL_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(SMESH_CXXFLAGS) \ - @CORBA_CXXFLAGS@ \ - @CORBA_INCLUDES@ \ - -I$(top_builddir)/idl - -libSalomeIDLHexoticPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLHexoticPLUGIN_la_LIBADD = \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ - $(SMESH_LDFLAGS) -lSalomeIDLSMESH \ - $(GEOM_LDFLAGS) -lSalomeIDLGEOM \ - @CORBA_LIBS@ - -# These variables defines the building process of CORBA files -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ \ - -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome \ - -I$(SMESH_ROOT_DIR)/idl/salome - -IDLCXXFLAGS = \ - -bcxx \ - @IDLCXXFLAGS@ \ - -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome \ - -I$(SMESH_ROOT_DIR)/idl/salome -IDLPYFLAGS = \ - @IDLPYFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome \ - -I$(SMESH_ROOT_DIR)/idl/salome - -# potential problem on parallel make on the following - multiple outputs -SUFFIXES = .idl .hh SK.cc -.idlSK.cc: - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< -.idl.hh: - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) - $(INSTALL) -d $(DESTDIR)$(salomepythondir) - ls $^ | while read file; do \ - $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ - done - -# we want to remove only staff generated for IDL files and nothing more -uninstall-local: - @for modulen in HexoticPlugin ; do \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ - done ; \ - for filen in $(BASEIDL_FILES_PY) ; do \ - echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ - done - -mostlyclean-local: - -rm -f *.hh *.cc .depidl - -# we use cpp to generate dependencies between idl files. -# option x c tells the preprocessor to consider idl as a c file. -# if an idl is modified, all idl dependencies are rebuilt - -.depidl: $(BASEIDL_FILES) - @echo "" > $@ - @for dep in $^ dummy; do \ - if [ $$dep != "dummy" ]; then \ - echo Building dependencies for $$dep; \ - $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ - sed 's/\.o/\SK.cc/' >>$@; \ - fi; \ - done ; - --include .depidl diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt new file mode 100755 index 0000000..3392f4a --- /dev/null +++ b/resources/CMakeLists.txt @@ -0,0 +1,39 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +IF(SALOME_BUILD_GUI) + SET(HexoticPLUGIN_RESOURCES_FILES_WITH_GUI + Hexotic.png + mesh_algo_Hexotic.png + mesh_hypo_Hexotic.png + mesh_tree_algo_Hexotic.png + mesh_tree_hypo_Hexotic.png + ) +ENDIF(SALOME_BUILD_GUI) + +SET(HexoticPLUGIN_RESOURCES_FILES + HexoticPLUGIN.xml + SalomeApp.xml + ${HexoticPLUGIN_RESOURCES_FILES_WITH_GUI} +) + +INSTALL(FILES ${HexoticPLUGIN_RESOURCES_FILES} DESTINATION ${SALOME_HexoticPLUGIN_INSTALL_RES_DATA}) diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index eb91eb1..0000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomeres_DATA = \ - HexoticPLUGIN.xml \ - SalomeApp.xml - -if HEXOTICPLUGIN_ENABLE_GUI - dist_salomeres_DATA += \ - Hexotic.png \ - mesh_algo_Hexotic.png \ - mesh_hypo_Hexotic.png \ - mesh_tree_algo_Hexotic.png \ - mesh_tree_hypo_Hexotic.png -endif diff --git a/src/Makefile.am b/src/CMakeLists.txt old mode 100644 new mode 100755 similarity index 69% rename from src/Makefile.am rename to src/CMakeLists.txt index 826e8f4..d6a0d90 --- a/src/Makefile.am +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,17 +17,25 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am +## +# Common packages +## +SET(SUBDIRS_COMMON + HexoticPlugin +) + +IF(SALOME_BUILD_GUI) + SET(SUBDIRS_ENABLE_GUI + GUI + ) +ENDIF(SALOME_BUILD_GUI) -SUBDIRS = HexoticPlugin +SET(SUBDIRS + ${SUBDIRS_COMMON} + ${SUBDIRS_ENABLE_GUI} +) -if HEXOTICPLUGIN_ENABLE_GUI - SUBDIRS += GUI -endif +FOREACH(dir ${SUBDIRS}) + ADD_SUBDIRECTORY(${dir}) +ENDFOREACH(dir ${SUBDIRS}) -DIST_SUBDIRS = HexoticPlugin GUI diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt new file mode 100644 index 0000000..d2e1f1e --- /dev/null +++ b/src/GUI/CMakeLists.txt @@ -0,0 +1,120 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(resources) + +INCLUDE(UseQt4Ext) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${CAS_INCLUDE_DIRS} + ${PYTHON_INCLUDES} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${SMESH_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_SOURCE_DIR}/src/HexoticPlugin +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${QT_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${SMESH_SMESH} + ${SMESH_StdMeshersGUI} + ${CAS_KERNEL} + ${GUI_suit} + ${GUI_qtx} + ${GUI_SalomeApp} + ${QT_LIBRARIES} + SalomeIDLHexoticPLUGIN + HexoticEngine +) + +# --- headers --- + +# header files / to be processed by moc +SET(_moc_HEADERS + HexoticPluginGUI_HypothesisCreator.h + HexoticPluginGUI_Dlg.h +) + +# header files / no moc processed +SET(_other_HEADERS + HexoticPluginGUI.h +) + +SET(HexoticPluginGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +# sources / static +SET(_other_SOURCES + HexoticPluginGUI.cxx + HexoticPluginGUI_StdWidget.cxx + HexoticPluginGUI_SizeMapsWidget.cxx + HexoticPluginGUI_HypothesisCreator.cxx +) + +# --- resources --- + +# resource files / to be processed by lrelease +SET(_ts_RESOURCES + HexoticPLUGIN_images.ts + HexoticPLUGIN_msg_en.ts + HexoticPLUGIN_msg_fr.ts +) + +# resource files / to be processed by uic +SET(_uic_files + HexoticPluginGUI_StdWidget_QTD.ui + HexoticPluginGUI_SizeMapsWidget_QTD.ui +) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# sources / to compile +SET(HexoticPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS}) + +# --- rules --- + +ADD_LIBRARY(HexoticPluginGUI ${HexoticPluginGUI_SOURCES}) +TARGET_LINK_LIBRARIES(HexoticPluginGUI ${_link_LIBRARIES} ) +INSTALL(TARGETS HexoticPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${HexoticPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + +QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HexoticPLUGIN_INSTALL_RES_DATA}") diff --git a/src/GUI/HexoticPluginGUI_HypothesisCreator.h b/src/GUI/HexoticPluginGUI_HypothesisCreator.h index a786356..fafcaad 100644 --- a/src/GUI/HexoticPluginGUI_HypothesisCreator.h +++ b/src/GUI/HexoticPluginGUI_HypothesisCreator.h @@ -106,8 +106,6 @@ private: protected slots: void onAddLocalSize(); void onRemoveLocalSize(); - void onItemChanged(QTableWidgetItem*); - void onItemDoubleClicked(QTableWidgetItem*); }; diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am deleted file mode 100644 index 377b283..0000000 --- a/src/GUI/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - HexoticPluginGUI.h \ - HexoticPluginGUI_Dlg.h \ - HexoticPluginGUI_HypothesisCreator.h - -# Libraries targets -lib_LTLIBRARIES = libHexoticPluginGUI.la - -dist_libHexoticPluginGUI_la_SOURCES = \ - HexoticPluginGUI.cxx \ - HexoticPluginGUI_StdWidget.cxx \ - HexoticPluginGUI_SizeMapsWidget.cxx \ - HexoticPluginGUI_HypothesisCreator.cxx - -MOC_FILES = \ - HexoticPluginGUI_HypothesisCreator_moc.cxx \ - HexoticPluginGUI_Dlg_moc.cxx - -UIC_FILES = \ - ui_HexoticPluginGUI_StdWidget_QTD.h \ - ui_HexoticPluginGUI_SizeMapsWidget_QTD.h - -BUILT_SOURCES = $(UIC_FILES) - -nodist_libHexoticPluginGUI_la_SOURCES = \ - $(MOC_FILES) - -# additionnal information to compil and link file - -libHexoticPluginGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(SMESH_CXXFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../HexoticPlugin \ - -I$(top_builddir)/idl - -libHexoticPluginGUI_la_LDFLAGS = \ - ../HexoticPlugin/libHexoticEngine.la \ - ../../idl/libSalomeIDLHexoticPLUGIN.la \ - ${SMESH_LDFLAGS} -lSMESH -lStdMeshersGUI \ - $(CAS_KERNEL) \ - $(GUI_LDFLAGS) -lsuit -lqtx -lSalomeApp \ - $(QT_LIBS) - -# resources files -nodist_salomeres_DATA = \ - HexoticPLUGIN_images.qm \ - HexoticPLUGIN_msg_en.qm \ - HexoticPLUGIN_msg_fr.qm - -SUBDIRS = resources - -DIST_SUBDIRS = resources diff --git a/src/GUI/resources/CMakeLists.txt b/src/GUI/resources/CMakeLists.txt new file mode 100755 index 0000000..050590d --- /dev/null +++ b/src/GUI/resources/CMakeLists.txt @@ -0,0 +1,33 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +IF(SALOME_BUILD_GUI) + SET(HexoticPLUGIN_RESOURCES_FILES_WITH_GUI + sd_mode_geom.png + sd_mode_1.png + sd_mode_2.png + sd_mode_3.png + sd_mode_4.png + ) +ENDIF(SALOME_BUILD_GUI) + +INSTALL(FILES ${HexoticPLUGIN_RESOURCES_FILES_WITH_GUI} DESTINATION ${SALOME_HexoticPLUGIN_INSTALL_RES_DATA}) diff --git a/src/GUI/resources/Makefile.am b/src/GUI/resources/Makefile.am deleted file mode 100644 index 0cba8a9..0000000 --- a/src/GUI/resources/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Gilles DAVID, EDF (gilles-g.david@edf.fr) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if HEXOTICPLUGIN_ENABLE_GUI - dist_salomeres_DATA = \ - sd_mode_geom.png \ - sd_mode_1.png \ - sd_mode_2.png \ - sd_mode_3.png \ - sd_mode_4.png -endif diff --git a/src/HexoticPlugin/CMakeLists.txt b/src/HexoticPlugin/CMakeLists.txt new file mode 100644 index 0000000..021ad53 --- /dev/null +++ b/src/HexoticPlugin/CMakeLists.txt @@ -0,0 +1,118 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# 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. +# +# 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 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${SMESH_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${BLSURFPLUGIN_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKernel} + ${CAS_TKMath} + ${CAS_TKG3d} + ${CAS_TKTopAlgo} + ${CAS_TKBRep} + ${CAS_SALOMELocalTrace} + ${SMESH_SMESHimpl} + ${SMESH_SMESHEngine} + ${SMESH_StdMeshersEngine} + ${SMESH_SMDS} + ${SMESH_SMESHDS} + ${SMESH_SalomeIDLSMESH} + ${SMESH_SMESHUtils} + ${KERNEL_SalomeGenericObj} + ${KERNEL_SALOMELocalTrace} + SalomeIDLHexoticPLUGIN +) + +# --- headers --- + +# header files +SET(NETGENEngine_HEADERS + NETGENPlugin_NETGEN_3D.hxx + NETGENPlugin_NETGEN_3D_i.hxx + NETGENPlugin_NETGEN_2D.hxx + NETGENPlugin_NETGEN_2D_i.hxx + NETGENPlugin_NETGEN_2D3D.hxx + NETGENPlugin_NETGEN_2D3D_i.hxx + NETGENPlugin_NETGEN_2D_ONLY.hxx + NETGENPlugin_NETGEN_2D_ONLY_i.hxx + NETGENPlugin_Hypothesis.hxx + NETGENPlugin_Hypothesis_i.hxx + NETGENPlugin_Hypothesis_2D.hxx + NETGENPlugin_Hypothesis_2D_i.hxx + NETGENPlugin_Hypothesis_3D_i.hxx + NETGENPlugin_Hypothesis_2D_ONLY_i.hxx + NETGENPlugin_SimpleHypothesis_2D.hxx + NETGENPlugin_SimpleHypothesis_3D.hxx + NETGENPlugin_SimpleHypothesis_2D_i.hxx + NETGENPlugin_SimpleHypothesis_3D_i.hxx + NETGENPlugin_Mesher.hxx + NETGENPlugin_Defs.hxx +) + +# --- sources --- + +# sources / static +SET(HexoticEngine_SOURCES + HexoticPlugin_Hexotic.hxx + HexoticPlugin_Hexotic.cxx + HexoticPlugin_Hexotic_i.hxx + HexoticPlugin_Hexotic_i.cxx + HexoticPlugin_Hypothesis.hxx + HexoticPlugin_Hypothesis.cxx + HexoticPlugin_Hypothesis_i.hxx + HexoticPlugin_Hypothesis_i.cxx + HexoticPlugin_i.cxx + HexoticPlugin_Defs.hxx +) + +# --- scripts --- + +# scripts / static +SET(_python_SCRIPTS + __init__.py + HexoticPLUGINBuilder.py +) + +# --- rules --- + +ADD_LIBRARY(HexoticEngine ${HexoticEngine_SOURCES}) +TARGET_LINK_LIBRARIES(HexoticEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS HexoticEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/HexoticPLUGIN) diff --git a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx index b6be4d6..47248a4 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx +++ b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx @@ -374,9 +374,7 @@ static void removeHexoticFiles(TCollection_AsciiString file_In, TCollection_Asci //======================================================================= static bool readResult(std::string theFile, -#ifdef WITH_SMESH_CANCEL_COMPUTE HexoticPlugin_Hexotic* theAlgo, -#endif SMESHDS_Mesh* theMesh, const int nbShape, const TopoDS_Shape* tabShape, @@ -500,12 +498,10 @@ static bool readResult(std::string theFile, coord = new double[nbRef]; for ( int iElem = 0; iElem < nbElem; iElem++ ) { -#ifdef WITH_SMESH_CANCEL_COMPUTE if(theAlgo->computeCanceled()) { return false; } -#endif aHexoticID = iElem + 1; for ( int iCoord = 0; iCoord < 3; iCoord++ ) fileRes >> coord[ iCoord ]; @@ -530,12 +526,10 @@ static bool readResult(std::string theFile, node = new SMDS_MeshNode*[ nbRef ]; nodeID = new int[ nbRef ]; for ( int iElem = 0; iElem < nbElem; iElem++ ) { -#ifdef WITH_SMESH_CANCEL_COMPUTE if(theAlgo->computeCanceled()) { return false; } -#endif for ( int iRef = 0; iRef < nbRef; iRef++ ) { fileRes >> aHexoticNodeID; // read nbRef aHexoticNodeID node[ iRef ] = HexoticNode[ aHexoticNodeID ]; @@ -664,9 +658,7 @@ static bool readResult(std::string theFile, //======================================================================= static bool readResult(std::string theFile, -#ifdef WITH_SMESH_CANCEL_COMPUTE HexoticPlugin_Hexotic* theAlgo, -#endif SMESH_MesherHelper* theHelper) { SMESHDS_Mesh* theMesh = theHelper->GetMeshDS(); @@ -739,12 +731,10 @@ static bool readResult(std::string theFile, SMDS_MeshNode * aHexoticNode; for ( int iElem = 0; iElem < nbElem; iElem++ ) { -#ifdef WITH_SMESH_CANCEL_COMPUTE if(theAlgo->computeCanceled()) { return false; } -#endif aHexoticID = iElem + 1; for ( int iCoord = 0; iCoord < 3; iCoord++ ) fileRes >> coord[ iCoord ]; @@ -766,12 +756,10 @@ static bool readResult(std::string theFile, for ( int iElem = 0; iElem < nbElem; iElem++ ) { -#ifdef WITH_SMESH_CANCEL_COMPUTE if(theAlgo->computeCanceled()) { return false; } -#endif for ( int iRef = 0; iRef < nbRef; iRef++ ) { fileRes >> aHexoticNodeID; // read nbRef aHexoticNodeID @@ -1410,9 +1398,7 @@ gp_Pnt HexoticPlugin_Hexotic::tangencyPoint(const gp_Pnt& p1, bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape) { -#ifdef WITH_SMESH_CANCEL_COMPUTE _compute_canceled = false; -#endif bool Ok = true; SMESHDS_Mesh* meshDS = aMesh.GetMeshDS(); TCollection_AsciiString hexahedraMessage; @@ -1535,9 +1521,7 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh, system( modeFile_Out.ToCString() ); if ( ! fileRes.fail() ) { Ok = readResult( Hexotic_Out.ToCString(), -#ifdef WITH_SMESH_CANCEL_COMPUTE this, -#endif meshDS, _nbShape, tabShape, tabBox ); if(Ok) { /********************* @@ -1606,10 +1590,8 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh, _nbShape = 0; _iShape = 0; } -#ifdef WITH_SMESH_CANCEL_COMPUTE if(_compute_canceled) return error(SMESH_Comment("interruption initiated by user")); -#endif return Ok; } @@ -1626,9 +1608,7 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh& aMesh, bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper) { -#ifdef WITH_SMESH_CANCEL_COMPUTE _compute_canceled = false; -#endif /* SMESH_ComputeErrorPtr myError = SMESH_ComputeError::New(); */ @@ -1682,9 +1662,7 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel system( modeFile_Out.ToCString() ); if ( ! fileRes.fail() ) { Ok = readResult( Hexotic_Out.ToCString(), -#ifdef WITH_SMESH_CANCEL_COMPUTE this, -#endif aHelper ); if(Ok) /* @@ -1735,10 +1713,8 @@ bool HexoticPlugin_Hexotic::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel cout << "Hexahedra meshing " << hexahedraMessage << std::endl; cout << std::endl; -#ifdef WITH_SMESH_CANCEL_COMPUTE if(_compute_canceled) return error(SMESH_Comment("interruption initiated by user")); -#endif removeFile(Hexotic_Out); removeFile(Hexotic_In); removeFile(aLogFileName); @@ -1773,7 +1749,6 @@ bool HexoticPlugin_Hexotic::Evaluate(SMESH_Mesh& aMesh, return true; } -#ifdef WITH_SMESH_CANCEL_COMPUTE void HexoticPlugin_Hexotic::CancelCompute() { _compute_canceled = true; @@ -1786,4 +1761,3 @@ void HexoticPlugin_Hexotic::CancelCompute() system( cmd.ToCString() ); #endif } -#endif diff --git a/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx b/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx index 03baf34..b93dba9 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx +++ b/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx @@ -41,6 +41,7 @@ #include "DriverGMF_Read.hxx" #include "DriverGMF_Write.hxx" +#include #include CORBA_CLIENT_HEADER(GEOM_Gen) #include @@ -70,10 +71,8 @@ public: virtual bool Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper); -#ifdef WITH_SMESH_CANCEL_COMPUTE virtual void CancelCompute(); bool computeCanceled() { return _compute_canceled;}; -#endif virtual bool Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, MapShapeNbElems& aResMap); @@ -143,9 +142,8 @@ private: const BLSURFPlugin_Hypothesis* _blsurfHypo; #endif -#ifdef WITH_SMESH_CANCEL_COMPUTE + volatile bool _compute_canceled; -#endif SALOMEDS::Study_var myStudy; SMESH_Gen_i* smeshGen_i; diff --git a/src/HexoticPlugin/Makefile.am b/src/HexoticPlugin/Makefile.am deleted file mode 100644 index 32a1ea0..0000000 --- a/src/HexoticPlugin/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D -# -# 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. -# -# 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 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -# --- -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = - -# Libraries targets -lib_LTLIBRARIES = libHexoticEngine.la - -dist_libHexoticEngine_la_SOURCES = \ - HexoticPlugin_Hexotic.hxx \ - HexoticPlugin_Hexotic.cxx \ - HexoticPlugin_Hexotic_i.hxx \ - HexoticPlugin_Hexotic_i.cxx \ - HexoticPlugin_Hypothesis.hxx \ - HexoticPlugin_Hypothesis.cxx \ - HexoticPlugin_Hypothesis_i.hxx \ - HexoticPlugin_Hypothesis_i.cxx \ - HexoticPlugin_i.cxx \ - HexoticPlugin_Defs.hxx - -libHexoticEngine_la_CPPFLAGS = \ - -I$(top_builddir)/idl \ - $(SMESH_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(BLSURFPLUGIN_CXXFLAGS) - -libHexoticEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLHexoticPLUGIN.la \ - $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine -lSMDS -lSMESHDS -lSalomeIDLSMESH -lSMESHUtils \ - $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace \ - $(CAS_LDPATH) -lTKernel -lTKMath -lTKG3d -lTKTopAlgo -lTKBRep -lSALOMELocalTrace \ - $(BLSURFPLUGIN_LDFLAGS) - -# Scripts to be installed. -#dist_salomescript_DATA=HexoticPLUGINDC.py -mypkgpythondir = $(salomepythondir)/salome/HexoticPLUGIN -mypkgpython_PYTHON = \ - __init__.py \ - HexoticPLUGINBuilder.py -- 2.30.2