--- /dev/null
+# 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(SalomeHEXABLOCK 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})
+
+# 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" ON)
+OPTION(SALOME_BUILD_DOC "Generate SALOME HEXABLOCK documentation" ON)
+
+# Advanced options:
+OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
+MARK_AS_ADVANCED(SALOME_BUILD_GUI)
+
+##
+## From KERNEL:
+##
+
+# Various
+# Python
+FIND_PACKAGE(SalomePython REQUIRED)
+# SWIG
+FIND_PACKAGE(SalomeSWIG REQUIRED)
+# Boost
+FIND_PACKAGE(SalomeBoost REQUIRED)
+# CORBA
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
+# LibXml2
+FIND_PACKAGE(SalomeLibXml2 REQUIRED)
+
+# Other KERNEL optionals:
+IF(SALOME_USE_MPI)
+ FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
+ENDIF()
+IF(SALOME_BUILD_DOC)
+ FIND_PACKAGE(SalomeSphinx)
+ SALOME_LOG_OPTIONAL_PACKAGE(Sphinx 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)
+ # Various
+ # Qt4
+ FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ 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)
+
+# OCCT
+FIND_PACKAGE(SalomeCAS REQUIRED)
+# VTK
+FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
+
+IF(SALOME_BUILD_TESTS)
+ FIND_PACKAGE(SalomeCppUnit)
+ SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
+ENDIF(SALOME_BUILD_TESTS)
+
+
+# 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})
+
+# 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_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 HEXABLOCK:
+SET(SALOME_HEXABLOCK_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/hexablock" CACHE PATH
+ "Install path: SALOME HEXABLOCK 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_HEXABLOCK_INSTALL_RES_DATA)
+
+# Sources
+# ========
+
+ADD_SUBDIRECTORY(adm_local)
+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(HEXABLOCK_version.h.in HEXABLOCK_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
+ HEXABLOCKEngine _hexablock_swig MyDlgRef
+)
+
+IF(SALOME_BUILD_GUI)
+ LIST(APPEND _${PROJECT_NAME}_exposed_targets
+ HEXABLOCK
+ )
+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(GEOM_ROOT_DIR "${GEOM_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
+ GEOM_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)
#if !defined(__HEXABLOCK_VERSION_H__)
#define __HEXABLOCK_VERSION_H__
-/*
- HEXABLOCK_VERSION is (major << 16) + (minor << 8) + patch.
+/*!
+ Specify version of SALOME HEXABLOCK module, as follows
+
+ HEXABLOCK_VERSION_MAJOR : (integer) number identifying major version
+ HEXABLOCK_VERSION_MINOR : (integer) number identifying minor version
+ HEXABLOCK_VERSION_MAINTENANCE : (integer) number identifying maintenance version
+ HEXABLOCK_VERSION_STR : (string) complete version number "major.minor.maintenance"
+ HEXABLOCK_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance
+ HEXABLOCK_DEVELOPMENT : (integer) indicates development version when set to 1
*/
-#define HEXABLOCK_VERSION_STR "@VERSION@"
-#define HEXABLOCK_VERSION @XVERSION@
-#define HEXABLOCK_DEVELOPMENT @VERSION_DEV@
+#define HEXABLOCK_VERSION_MAJOR @SALOMEHEXABLOCK_MAJOR_VERSION@
+#define HEXABLOCK_VERSION_MINOR @SALOMEHEXABLOCK_MINOR_VERSION@
+#define HEXABLOCK_VERSION_MAINTENANCE @SALOMEHEXABLOCK_PATCH_VERSION@
+#define HEXABLOCK_VERSION_STR "@SALOMEHEXABLOCK_VERSION@"
+#define HEXABLOCK_VERSION @SALOMEHEXABLOCK_XVERSION@
+#define HEXABLOCK_DEVELOPMENT @SALOMEHEXABLOCK_VERSION_DEV@
#endif // __HEXABLOCK_VERSION_H__
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-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
-
-SUBDIRS = adm_local src bin doc
-
-DIST_SUBDIRS= adm_local src bin doc
-
-DISTCLEANFILES = a.out aclocal.m4 configure
-
-salomeinclude_DATA = HEXABLOCK_version.h
-
-EXTRA_DIST += \
- build_configure \
- clean_configure \
- cppunit-report.xml
-
-dist-hook:
- rm -rf `find $(distdir) -name CVS`
-
-unittest:
- ( ./src/TEST_CPP/Test_HEXABLOCK )
--- /dev/null
+# - 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 HEXABLOCKEngine AND NOT @PROJECT_NAME@_BINARY_DIR)
+ INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake")
+ENDIF()
+
+# Package root dir:
+SET_AND_CHECK(HEXABLOCK_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
+
+# Include directories
+SET_AND_CHECK(HEXABLOCK_INCLUDE_DIRS "${HEXABLOCK_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
+
+#### Now the specificities
+
+# Options exported by the package:
+SET(SALOME_HEXABLOCK_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_HEXABLOCK_BUILD_DOC @SALOME_BUILD_DOC@)
+
+# Advanced options
+SET(SALOME_HEXABLOCK_BUILD_GUI @SALOME_BUILD_GUI@)
+
+# Level 1 prerequisites:
+SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_GEOM_ROOT_DIR@")
+
+# 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_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 GEOM targets if they were not already loaded:
+IF(NOT (TARGET GEOMbasic))
+ INCLUDE("${GEOM_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeGEOMTargets.cmake")
+ENDIF()
+
+# Exposed HEXABLOCK targets:
+SET(HEXABLOCK_HEXABLOCKEngine HEXABLOCKEngine)
+SET(HEXABLOCK_HEXABLOCK HEXABLOCK)
+SET(HEXABLOCK__hexablock_swig _hexablock_swig)
+SET(HEXABLOCK_MyDlgRef MyDlgRef)
\ No newline at end of file
--- /dev/null
+# 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(unix)
+ADD_SUBDIRECTORY(cmake_files)
+++ /dev/null
-# Copyright (C) 2009-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
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SUBDIRS = unix
--- /dev/null
+# 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
+#
+
+# ===============================================================
+# Files to be installed
+# ===============================================================
+
+# These files are data, module or lib files
+SET(_adm_data
+ FindSalomeHEXABLOCK.cmake
+)
+INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})
--- /dev/null
+# 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
+#
+#
+
+IF(NOT SalomeHEXABLOCK_FIND_QUIETLY)
+ MESSAGE(STATUS "Looking for Salome HEXABLOCK ...")
+ENDIF()
+
+SET(CMAKE_PREFIX_PATH "${HEXABLOCK_ROOT_DIR}")
+
+SALOME_FIND_PACKAGE(SalomeHEXABLOCK SalomeHEXABLOCK CONFIG)
+
+IF(NOT SalomeHEXABLOCK_FIND_QUIETLY)
+ MESSAGE(STATUS "Found Salome HEXABLOCK: ${HEXABLOCK_ROOT_DIR}")
+ENDIF()
--- /dev/null
+# 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(config_files)
+++ /dev/null
-# Copyright (C) 2009-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
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-SUBDIRS = config_files
--- /dev/null
+# 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
+#
+
+SET(_m4_data
+ check_sphinx.m4
+ ac_python_devel.m4
+ check_HEXABLOCK.m4
+)
+
+INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files)
+++ /dev/null
-# Copyright (C) 2009-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
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-dist_admlocalm4_DATA = \
- check_sphinx.m4 \
- ac_python_devel.m4 \
- check_HEXABLOCK.m4
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-# ============================================================
-# 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
-
-# meta object implementation files generation (moc)
-%_moc.cxx: %.hxx
- $(MOC) $< -o $@
-
-# translation (*.qm) files generation (lrelease)
-%.qm: resources/%.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=%.hxx) $(QRC_FILES:qrc_%.cxx=%.qrc) \
- $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=resources/%.ts)
-
-# 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;
--- /dev/null
+# 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})
+SALOME_CONFIGURE_FILE(runAppli.in runAppli INSTALL ${SALOME_INSTALL_BINS})
+
+# ===============================================================
+# Files to be installed
+# ===============================================================
+
+SET(_bin_scripts
+ myrunSalome.py
+)
+
+SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
\ No newline at end of file
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-dist_salomescript_SCRIPTS = \
- myrunSalome.py
-
-nodist_salomescript_SCRIPTS = \
- runAppli
-
-nodist_salomescript_DATA = \
- VERSION
-[SALOME HEXABLOCK] : @VERSION@
-[DEVELOPMENT] : @VERSION_DEV@
+[SALOME HEXABLOCK] : @SALOMEHEXABLOCK_VERSION@
+[DEVELOPMENT] : @SALOMEHEXABLOCK_VERSION_DEV@
+++ /dev/null
-#!/bin/bash
-# Copyright (C) 2009-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
-#
-
-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 GUI_ROOT_DIR is set correctly
-
-if test ! -d "${GUI_ROOT_DIR}"; then
- echo "failed : GUI_ROOT_DIR 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
-
-cd ${CONF_DIR}
-ABS_CONF_DIR=`pwd`
-
-mkdir -p salome_adm/unix/config_files
-#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
-#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
-
-cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
-
-#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
-
-# remove KERNEL deprecated configure files
-#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
-# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
-# check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
-# do
-# rm -f salome_adm/unix/config_files/${deprecated}
-# done
-
-
-# ____________________________________________________________________
-# aclocal creates the aclocal.m4 file from the standard macro and the
-# custom macro embedded in the directory salome_adm/unix/config_files
-# and KERNEL config_files directory.
-# output:
-# aclocal.m4
-# autom4te.cache (directory)
-echo "====================================================== aclocal"
-
-
-if test -d "${GUI_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 ${GUI_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 || exit 1
-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(<mydir>) tag (see configure.ac).
-# output:
-# salome_adm/unix/config_files/config.guess
-# salome_adm/unix/config_files/config.sub
-# salome_adm/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(<mydir>) tag (see configure.ac). This step also
-# creates the Makefile.in files from the Makefile.am files.
-# output:
-# salome_adm/unix/config_files/compile
-# salome_adm/unix/config_files/depcomp
-# salome_adm/unix/config_files/install-sh
-# salome_adm/unix/config_files/missing
-# salome_adm/unix/config_files/py-compile
-# Makefile.in (from Makefile.am)
-echo "====================================================== automake"
-
-automake --copy --gnu --add-missing
+++ /dev/null
-#!/bin/sh
-# Copyright (C) 2009-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
-#
-
-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 l*.m4 ltmain.sh missing py-compile )
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-AC_INIT([Salome6 Project HEXABLOCK module],[7.2.0], [webmaster.salome@opencascade.com], [SalomeHEXABLOCK])
-AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([-Wno-portability])
-
-SHORT_VERSION=`echo $VERSION | awk -F. '{printf("%d.%d",$1,$2)}'`
-AC_SUBST(SHORT_VERSION)
-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=hexablock
-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
-
-AC_CHECK_PROG(SHELL,sh)
-AC_SUBST(SHELL)
-
-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 + for shared libraries
-
-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}'/salome_adm/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_CXX_WARNINGS
-AC_CXX_TEMPLATE_OPTIONS
-AC_DEPEND_FLAG
-# AC_CC_WARNINGS([ansi])
-cc_ok=yes
-
-dnl Library libdl :
-AC_CHECK_LIB(dl,dlopen)
-
-dnl Library librt : for alpha/osf
-AC_CHECK_LIB(rt,nanosleep)
-
-dnl add library libm :
-AC_CHECK_LIB(m,ceil)
-
-AC_CXX_USE_STD_IOSTREAM
-AC_CXX_HAVE_SSTREAM
-
-dnl
-dnl ---------------------------------------------
-dnl testing linker
-dnl ---------------------------------------------
-dnl
-
-AC_LINKER_OPTIONS
-
-echo
-echo ---------------------------------------------
-echo testing threads
-echo ---------------------------------------------
-echo
-
-ENABLE_PTHREADS
-
-echo
-echo ---------------------------------------------
-echo testing python
-echo ---------------------------------------------
-echo
-
-CHECK_PYTHON
-
-AM_PATH_PYTHON(2.3)
-CHECK_SWIG
-
-
-AC_PYTHON_DEVEL
-
-echo
-echo ---------------------------------------------
-echo testing QT
-echo ---------------------------------------------
-echo
-
-CHECK_QT
-
-
-
-
-
-
-
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
-
-CHECK_BOOST
-
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
-
-CHECK_CAS
-
-echo
-echo ---------------------------------------------
-echo testing omniORB
-echo ---------------------------------------------
-echo
-
-CHECK_OMNIORB
-
-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 CPPUNIT only required for unit testing
-echo ----------------------------------------------
-echo
-CHECK_CPPUNIT
-
-
-
-echo
-echo ----------------------------------------------
-echo testing Sphinx
-echo ----------------------------------------------
-echo
-
-CHECK_SPHINX
-
-
-
-echo
-echo ---------------------------------------------
-echo Testing Kernel
-echo ---------------------------------------------
-echo
-
-CHECK_KERNEL
-
-
-
-echo
-echo ---------------------------------------------
-echo Testing GUI
-echo ---------------------------------------------
-echo
-
-CHECK_SALOME_GUI
-
-gui_ok=no
-if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then
- gui_ok=yes
-fi
-
-AM_CONDITIONAL(HEXABLOCK_ENABLE_GUI, [test "${gui_ok}" = "yes"])
-
-echo WITH GUI: ${gui_ok}
-
-echo
-echo ---------------------------------------------
-echo Testing Geom
-echo ---------------------------------------------
-echo
-
-CHECK_GEOM
-
-
-echo
-echo ---------------------------------------------
-echo Testing LIBXML
-echo ---------------------------------------------
-echo
-AC_CHECK_LIBXML
-
-
-echo
-echo ---------------------------------------------
-echo Testing QT4
-echo ---------------------------------------------
-echo
-I2_CHECK_QT4
-
-
-
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
-CHECK_VTK
-
-
-echo
-echo ---------------------------------------------
-echo Summary
-echo ---------------------------------------------
-echo
-
-echo Configure
-variables="cc_ok threads_ok boost_ok python_ok omniORB_ok qt_ok occ_ok sphinx_ok vtk_ok Kernel_ok SalomeGUI_ok Geom_ok"
-
-for var in $variables
-do
- printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
- eval echo \$$var
-done
-
-echo
-echo "Default ORB : $DEFAULT_ORB"
-echo
-
-dnl AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no])
-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
-echo
-echo ---------------------------------------------
-echo generating Makefiles and configure files
-echo ---------------------------------------------
-echo
-
-AC_OUTPUT_COMMANDS([ \
- chmod +x ./bin/*; \
-])
-
-
-
-AM_CONDITIONAL(WINDOWS, [ test ])
-
-# This list is initiated using autoscan and must be updated manually
-# when adding a new file <filename>.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([ \
- salome_adm/unix/SALOMEconfig.h \
- adm_local/Makefile \
- adm_local/unix/Makefile \
- adm_local/unix/config_files/Makefile \
- bin/VERSION \
- bin/runAppli \
- bin/Makefile \
- doc/Makefile \
- doc/conf.py \
- HEXABLOCK_version.h \
- src/Makefile \
- src/HEXABLOCKGUI/Makefile \
- src/HEXABLOCKGUI/MyDlgRef/Makefile \
- src/HEXABLOCKGUI/resources/HEXABLOCKCatalog.xml \
- src/HEXABLOCKGUI/resources/SalomeApp.xml \
- src/HEXABLOCK/Makefile \
- src/HEXABLOCK_SWIG/Makefile \
- src/TEST_CPP/Makefile \
- src/TEST_PY/Makefile \
- Makefile \
-])
--- /dev/null
+# 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
+#
+
+# This file mainly prepares the environment in which sphinx should run:
+# this sets the PYTHONPATH and LD_LIBRARY_PATH to include OMNIORB, DOCUTILS, SETUPTOOLS, etc ...
+
+# Prepare Sphinx options
+SET(SPHINXOPTS
+)
+SET(SOURCEDIR
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+SET(SPHINXBUILD
+ sphinx-build
+)
+SET(PAPEROPT_a4
+ -D
+ latex_paper_size=a4
+)
+SET(ALLSPHINXOPTS
+ -d
+ doctrees
+ ${PAPEROPT_a4}
+ ${SPHINXOPTS}
+ ${SOURCEDIR}
+)
+
+SALOME_CONFIGURE_FILE(conf.py.in conf.py)
+
+# Write the shell file preparing the env for the Sphinx run:
+# This uses the paths to SPHINX, DOCUTILS and SETUPTOOLS:
+# Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake):
+
+SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+IF(WIN32)
+ STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH%
+ @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH%
+ @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH%
+ @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH%
+ @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH%
+ @SET PYTHONPATH=${HDF5_ROOT_DIR}\\lib\;%PYTHONPATH%
+ @SET PYTHONPATH=${MPI_ROOT_DIR}\\lib\;%PYTHONPATH%
+
+ @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\bin\\salome\;%PYTHONPATH%
+ @SET PATH=${KERNEL_ROOT_DIR}\\lib\\salome\;%PATH%
+ @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH%
+ @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH%
+
+ @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PYTHONPATH%
+ @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\python\;%PYTHONPATH%
+ @SET PATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PATH%
+ ")
+ SET(EXT "bat")
+ SET(CALL_STR "call")
+ELSE(WIN32)
+ SET(SCR " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH}
+ export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH}
+ export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH}
+ export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH}
+ export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH}
+ export PYTHONPATH=${HDF5_ROOT_DIR}/lib:\${PYTHONPATH}
+ export PYTHONPATH=${MPI_ROOT_DIR}/lib:\${PYTHONPATH}
+
+ export PYTHONPATH=${KERNEL_ROOT_DIR}/bin/salome:\${PYTHONPATH}
+ export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH}
+ export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH}
+ export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH}
+
+ export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib:\${PYTHONPATH}
+ export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+ export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH}
+ export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib:\${PYTHONPATH}
+ export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+ export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH}
+ export LD_LIBRARY_PATH=${OMNIORB_ROOT_DIR}/lib:\${LD_LIBRARY_PATH}
+ export PYTHONPATH=${SETUPTOOLS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+ export PYTHONPATH=${DOCUTILS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+ export PYTHONPATH=${SPHINX_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}
+"
+ )
+ SET(EXT "sh")
+ SET(CALL_STR ".")
+ENDIF(WIN32)
+
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}")
+
+ADD_CUSTOM_TARGET(html_docs ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINXBUILD} -c ${PROJECT_BINARY_DIR}/doc -b html ${ALLSPHINXOPTS} html)
+
+INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_INSTALL_DOC}/gui/HEXABLOCK)
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-# Makefile.am for Sphinx documentation of HEXABLOCK component
-# Author: Marine Marcilhac From CS
-
-.PHONY : latex
-
-if SPHINX_IS_OK
-
-hexablockdoc_DATA=html/index.html
-
-html/index.html:$(RSTFILES)
- make htm
-
-endif
-
-dev_docs: build_dev_docs install_dev_docs
-
-build_dev_docs:
- doxygen
-
-help:
- @echo "Please use \`make <target>' where <target> is one of"
- @echo " html to make standalone HTML files"
- @echo " pickle to make pickle files"
- @echo " json to make JSON files"
- @echo " htmlhelp to make HTML files and a HTML help project"
- @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
- @echo " changes to make an overview over all changed/added/deprecated items"
- @echo " linkcheck to check all external links for integrity"
-
-DOXFILES=
-
-EXTRA_DIST+= $(DOXFILES)
-
-hexablockdocdir=$(docdir)/gui/HEXABLOCK
-hexablockdevdocdir=$(docdir)/gui/HEXABLOCK/dev
-
-SPHINXOPTS =
-SOURCEDIR = $(srcdir)
-SPHINXBUILD = sphinx-build
-PAPEROPT_a4 = -D latex_paper_size=a4
-ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
-
-htm:
- mkdir -p html doctrees
- $(SPHINXBUILD) -c $(top_builddir)/doc -b html $(ALLSPHINXOPTS) html
- @echo
- @echo "Build finished. The HTML pages are in html."
-
-latex:
- mkdir -p latex doctrees
- $(SPHINXBUILD) -c $(top_builddir)/doc -b latex $(ALLSPHINXOPTS) latex
- @echo
- @echo "Build finished; the LaTeX files are in latex."
- @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
- "run these through (pdf)latex."
-
-pdf:
- $(SPHINXBUILD) -c $(top_builddir)/doc -b pdf $(ALLSPHINXOPTS) pdf
- @echo
- @echo "Build finished. The pdf documents are in pdf."
-
-html:
- mkdir -p $@
-
-htmldev:
- mkdir -p $@
-
-RSTFILES= \
- annexe.rst \
- block_method.rst \
- cad.rst \
- creategrids.rst \
- full_example_bridle.rst \
- general.rst \
- gui.rst \
- gui_asso_quad_to_geom.rst \
- gui_asso_vertex_to_geom.rst \
- gui_blocks_for_cyl_pipe.rst \
- gui_component.rst \
- gui_cut_hexa.rst \
- gui_cyl.rst \
- gui_disc_elmts.rst \
- gui_discret_law.rst \
- gui_document.rst \
- gui_edge.rst \
- gui_elements.rst \
- gui_groups.rst \
- gui_hexahedron.rst \
- gui_make_elmts.rst \
- gui_make_symmetry.rst \
- gui_merge_elmts.rst \
- gui_mesh.rst \
- gui_modify_elmts.rst \
- gui_modify_symmetry.rst \
- gui_association.rst \
- gui_pipe.rst \
- gui_prism_join_quad.rst \
- gui_propag.rst \
- gui_quadrangle.rst \
- gui_quad_revolution.rst \
- gui_remove.rst \
- gui_replace_hexa.rst \
- gui_hemisphere.rst \
- gui_vector.rst \
- gui_vertex.rst \
- index.rst \
- interactive.rst \
- intro_association.rst \
- intro_groups.rst \
- intro_mesh.rst \
- intro_python.rst \
- mesh.rst \
- python.rst \
- tui.rst \
- tui_asso_quad_to_geom.rst \
- tui_asso_vertex_to_geom.rst \
- tui_blocks_for_cyl_pipe.rst \
- tui_cartgrid.rst \
- tui_component.rst \
- tui_cut_hexa.rst \
- tui_make_symmetry.rst \
- tui_perform_symmetry.rst \
- tui_cylgrid.rst \
- tui_cyl.rst \
- tui_disc_elmts.rst \
- tui_quad_revolution.rst \
- tui_discret_law.rst \
- tui_association.rst \
- tui_document.rst \
- tui_edge.rst \
- tui_elements.rst \
- tui_groups.rst \
- tui_hexahedron.rst \
- tui_make_elmts.rst \
- tui_hemisphere_rind.rst \
- tui_merge_elmts.rst \
- tui_mesh.rst \
- tui_modify_elmts.rst \
- tui_pipe.rst \
- tui_prism_join_quad.rst \
- tui_propag.rst \
- tui_quadrangle.rst \
- tui_remove.rst \
- tui_replace_hexa.rst \
- tui_sphergrid.rst \
- tui_vector.rst \
- tui_vertex.rst
-
-
-
-
-
-
-
-EXTRA_DIST+= $(RSTFILES) _static cas_test_python
-
-install-data-local:
- $(INSTALL) -d $(DESTDIR)$(hexablockdocdir)
- if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
- cp -rf $$b"html"/* $(DESTDIR)$(hexablockdocdir) ; \
- if test -f $$b"latex"/using.pdf; then cp -f $$b"latex"/using.pdf $(DESTDIR)$(hexablockdocdir) ; fi; \
- if test -f $$b"latex"/integration.pdf; then cp -f $$b"latex"/integration.pdf $(DESTDIR)$(hexablockdocdir) ; fi;
-
-install_dev_docs:
- $(INSTALL) -d $(DESTDIR)$(hexablockdevdocdir)
- if test -d "htmldev"; then b=; else b="$(srcdir)/"; fi; \
- find $$b"htmldev" -name "*.*" -exec cp -rf {} $(DESTDIR)$(hexablockdevdocdir) ';' ; \
- cp -rf $(top_srcdir)/src/hexablockloader/samples $(DESTDIR)$(hexablockdevdocdir); \
- rm -rf $(DESTDIR)$(hexablockdevdocdir)/samples/CVS;
-
-uninstall-local:
- chmod -R +w $(DESTDIR)$(hexablockdocdir)
- rm -rf $(DESTDIR)$(hexablockdocdir)/*
-
-clean-local:
- -rm -rf html latex doctrees
- if test -d "html"; then rm -rf html ; fi
-
-dist-hook:
- if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
- if test -d $$b"html"; then cp -rf $$b"html" $(distdir) ; fi; \
- if test -d "htmldev"; then b=; else b="$(srcdir)/"; fi; \
- if test -d $$b"htmldev"; then cp -rf $$b"htmldev" $(distdir) ; fi
# The short X.Y version.
version = '@SHORT_VERSION@'
# The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
+release = '@SALOMEHEXABLOCK_VERSION@'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['@CMAKE_CURRENT_SOURCE_DIR@/_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
--- /dev/null
+# 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
+#
+
+##
+# Common packages
+##
+SET(SUBDIRS_COMMON
+ HEXABLOCK
+ HEXABLOCK_SWIG
+)
+
+IF(SALOME_BUILD_GUI)
+ SET(SUBDIRS_ENABLE_GUI
+ HEXABLOCKGUI
+ )
+ENDIF(SALOME_BUILD_GUI)
+
+IF(SALOME_BUILD_TESTS)
+ SET(SUBDIRS_TESTS
+ TEST_CPP
+ TEST_PY
+ )
+ENDIF(SALOME_BUILD_TESTS)
+
+SET(SUBDIRS
+ ${SUBDIRS_COMMON}
+ ${SUBDIRS_ENABLE_GUI}
+ ${SUBDIRS_TESTS}
+)
+
+FOREACH(dir ${SUBDIRS})
+ ADD_SUBDIRECTORY(${dir})
+ENDFOREACH(dir ${SUBDIRS})
--- /dev/null
+# 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(
+ ${KERNEL_INCLUDE_DIRS}
+ ${PYTHON_INCLUDE_DIRS}
+ ${CAS_INCLUDE_DIRS}
+ ${VTK_INCLUDE_DIRS}
+ ${GEOM_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+ ${OMNIORB_INCLUDE_DIR}
+ ${PROJECT_BINARY_DIR}/idl
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+ ${KERNEL_DEFINITIONS}
+ ${CAS_DEFINITIONS}
+ ${BOOST_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+ ${CAS_TKBRep}
+ ${CAS_TKPrim}
+ ${CAS_TKG3d}
+ ${CAS_TKG2d}
+ ${CAS_TKTopAlgo}
+ ${CAS_TKGeomBase}
+ ${CAS_TKGeomAlgo}
+ ${CAS_TKBool}
+ ${CAS_TKBO}
+ ${KERNEL_SALOMELocalTrace}
+ ${KERNEL_SALOMEBasics}
+ ${PYTHON_LIBRARIES}
+)
+
+# --- headers ---
+
+# header files
+SET(HEXABLOCKEngine_HEADERS
+ HexGroup.hxx
+ HexCylinder.hxx
+ HexEdge.hxx
+ HexGlobale.hxx
+ HexPropagation.hxx
+ HexVector.hxx
+ HexXmlWriter.hxx
+ hexa_base.hxx
+ HexDiagnostics.hxx
+ HexElements.hxx
+ HexHexa.hxx
+ HexMatrix.hxx
+ HexQuad.hxx
+ HexVertex.hxx
+ HexLaw.hxx
+ HexCloner.hxx
+ HexDocument.hxx
+ HexEltBase.hxx
+ Hex.hxx
+ HexPipe.hxx
+ HexShape.hxx
+ HexOldShape.hxx
+ HexNewShape.hxx
+ HexSubShape.hxx
+ HexVertexShape.hxx
+ HexEdgeShape.hxx
+ HexFaceShape.hxx
+ HexBiCylinderShape.hxx
+ HexAssoEdge.hxx
+ HexXmlTree.hxx
+ HexCrossElements.hxx
+ HexBiCylinder.hxx
+ HexDumpStudy.hxx
+ HexAnaQuads.hxx
+ HexKas_functions.hxx
+ HexWitness.hxx
+ HexCramer.hxx
+)
+
+# --- sources ---
+
+# sources / static
+SET(HEXABLOCKEngine_SOURCES
+ hexa_utils.cxx
+ HexEltBase.cxx
+ HexGlobale.cxx
+ HexCloner.cxx
+ HexVertex.cxx
+ HexEdge.cxx
+ HexQuad.cxx
+ HexHexa.cxx
+ HexHexa_disco.cxx
+ HexVector.cxx
+ HexElements.cxx
+ HexElements_bis.cxx
+ HexElements_ter.cxx
+ HexElements_piq.cxx
+ HexElements_asso.cxx
+ HexElements_grid.cxx
+ HexCylinder.cxx
+ HexGroup.cxx
+ HexPipe.cxx
+ HexLaw.cxx
+ HexShape.cxx
+ HexNewShape.cxx
+ HexSubShape.cxx
+ HexDocument_trans.cxx
+ HexDocument_tools.cxx
+ HexVertexShape.cxx
+ HexEdgeShape.cxx
+ HexFaceShape.cxx
+ HexBiCylinderShape.cxx
+ HexAssoEdge.cxx
+ HexDocument_Xml.cxx
+ HexDocument.cxx
+ HexXmlTree.cxx
+ HexXmlWriter.cxx
+ HexDumpStudy.cxx
+ HexCrossElements.cxx
+ HexCrossElements_build.cxx
+ HexBiCylinder.cxx
+ Hex.cxx
+ HexDocument_asso.cxx
+ HexDocument_quads.cxx
+ HexDocument_del.cxx
+ HexDocument_skin.cxx
+ HexDocument_v6.cxx
+ HexElements_v6.cxx
+ HexElements_check.cxx
+ HexElements_del.cxx
+ HexWitness.cxx
+ Hex_salome.cxx
+ test_unit.hxx
+ test_hexa6.cxx
+ HexKas_functions.cxx
+)
+
+# --- rules ---
+
+ADD_LIBRARY(HEXABLOCKEngine ${HEXABLOCKEngine_SOURCES})
+TARGET_LINK_LIBRARIES(HEXABLOCKEngine ${_link_LIBRARIES} )
+INSTALL(TARGETS HEXABLOCKEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
+INSTALL(FILES ${HEXABLOCKEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-#
-# ===============================================================
-# Files to be installed
-# ===============================================================
-#
-#
-# header files
-salomeinclude_HEADERS = \
- HexGroup.hxx \
- HexCylinder.hxx \
- HexEdge.hxx \
- HexGlobale.hxx \
- HexPropagation.hxx \
- HexVector.hxx \
- HexXmlWriter.hxx \
- hexa_base.hxx \
- HexDiagnostics.hxx \
- HexElements.hxx \
- HexHexa.hxx \
- HexMatrix.hxx \
- HexQuad.hxx \
- HexVertex.hxx \
- HexLaw.hxx \
- HexCloner.hxx \
- HexDocument.hxx \
- HexEltBase.hxx \
- Hex.hxx \
- HexPipe.hxx \
- HexShape.hxx \
- HexOldShape.hxx \
- HexNewShape.hxx \
- HexSubShape.hxx \
- HexVertexShape.hxx \
- HexEdgeShape.hxx \
- HexFaceShape.hxx \
- HexBiCylinderShape.hxx \
- HexAssoEdge.hxx \
- HexXmlTree.hxx \
- HexCrossElements.hxx \
- HexBiCylinder.hxx \
- HexDumpStudy.hxx \
- HexAnaQuads.hxx \
- HexKas_functions.hxx \
- HexWitness.hxx \
- HexCramer.hxx
-
-
-# Libraries targets
-# SD/Propagation/HexPropagation.cxx \
-# SD/Law/HexLaw.cxx \
-#
-lib_LTLIBRARIES = libHEXABLOCKEngine.la
-
-dist_libHEXABLOCKEngine_la_SOURCES = \
- hexa_utils.cxx \
- HexEltBase.cxx \
- HexGlobale.cxx \
- HexCloner.cxx \
- HexVertex.cxx \
- HexEdge.cxx \
- HexQuad.cxx \
- HexHexa.cxx \
- HexHexa_disco.cxx \
- HexVector.cxx \
- HexElements.cxx \
- HexElements_bis.cxx \
- HexElements_ter.cxx \
- HexElements_piq.cxx \
- HexElements_asso.cxx \
- HexElements_grid.cxx \
- HexCylinder.cxx \
- HexGroup.cxx \
- HexPipe.cxx \
- HexLaw.cxx \
- HexShape.cxx \
- HexNewShape.cxx \
- HexSubShape.cxx \
- HexDocument_trans.cxx \
- HexDocument_tools.cxx \
- HexVertexShape.cxx \
- HexEdgeShape.cxx \
- HexFaceShape.cxx \
- HexBiCylinderShape.cxx \
- HexAssoEdge.cxx \
- HexDocument_Xml.cxx \
- HexDocument.cxx \
- HexXmlTree.cxx \
- HexXmlWriter.cxx \
- HexDumpStudy.cxx \
- HexCrossElements.cxx \
- HexCrossElements_build.cxx \
- HexBiCylinder.cxx \
- Hex.cxx \
- HexDocument_asso.cxx \
- HexDocument_quads.cxx \
- HexDocument_del.cxx \
- HexDocument_skin.cxx \
- HexDocument_v6.cxx \
- HexElements_v6.cxx \
- HexElements_check.cxx \
- HexElements_del.cxx \
- HexWitness.cxx \
- Hex_salome.cxx \
- test_unit.hxx \
- test_hexa6.cxx \
- HexKas_functions.cxx
-
-# libHEXABLOCKEngine_la_CPPFLAGS = \
-# -I$(top_builddir)/salome_adm/unix
-#
-# libHEXABLOCKEngine_la_LDFLAGS = \
-# -lOpUtil
-
-libHEXABLOCKEngine_la_CPPFLAGS = \
- $(KERNEL_CXXFLAGS) \
- $(PYTHON_CPPFLAGS) \
- $(CAS_CPPFLAGS) \
- $(VTK_INCLUDES) \
- $(GEOM_CXXFLAGS) \
- $(HEXABLOCK_CXXFLAGS) \
- $(SMESH_CXXFLAGS) \
- $(BOOST_CPPFLAGS) \
- $(CORBA_CXXFLAGS) \
- $(CORBA_INCLUDES) \
- -I$(top_builddir)/idl
-
-libHEXABLOCKEngine_la_LDFLAGS = \
- $(PYTHON_LDFLAGS) \
- $(CAS_KERNEL) -lTKBRep -lTKPrim -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo -lTKBool -lTKBO \
- $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics
-
-
+++ /dev/null
-
-module = hexablock_swig
-uf = model
-wrapped = $(module)_wrap
-wrap_src = $(wrapped).cc
-lib_ext = so
-shared = _$(module).$(lib_ext)
-opt_cpp = -fPIC
-pyvers = 2.5 ## Saclay
-pyvers = 2.6
-
-all : $(shared)
- @echo " -- Librairie dynamique $(shared) a jour"
-
-$(wrap_src) : $(module).i
- @echo " -- Appel de swig ..."
- swig -python -c++ -o $(wrap_src) $(module).i
-####swig -python -c++ -o $(wrap_src) -module $(module) $(module).i
-
-$(wrapped).o : $(wrap_src)
- @echo " -- Compilation module genere par swig ..."
- g++ $(opt_cpp) -I/usr/include/python$(pyvers) -c $(wrap_src)
-
-$(shared) : $(wrapped).o lib$(uf).a
- @echo " -- Edition de liens librairie dynamique ..."
- g++ -shared $(wrapped).o -L. -l$(uf) -lpython$(pyvers) -o $(shared)
-
-$(wrap_src) : Hex.hxx
-$(wrap_src) : HexDocument.hxx
-$(wrap_src) : HexEltBase.hxx
-$(wrap_src) : HexVertex.hxx
-$(wrap_src) : HexEdge.hxx
-$(wrap_src) : HexQuad.hxx
-$(wrap_src) : HexHexa.hxx
-$(wrap_src) : HexElements.hxx
-$(wrap_src) : HexCrossElements.hxx
-$(wrap_src) : HexBiCylinder.hxx
--- /dev/null
+# 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(MyDlgRef)
+
+INCLUDE(UseQt4Ext)
+
+# --- options ---
+# additional include directories
+INCLUDE_DIRECTORIES(
+ ${QT_INCLUDES}
+ ${PYTHON_INCLUDE_DIRS}
+ ${OMNIORB_INCLUDE_DIR}
+ ${LIBXML2_INCLUDE_DIR}
+ ${Boost_INCLUDE_DIRS}
+ ${CAS_INCLUDE_DIRS}
+ ${VTK_INCLUDE_DIRS}
+ ${KERNEL_INCLUDE_DIRS}
+ ${GUI_INCLUDE_DIRS}
+ ${GEOM_INCLUDE_DIRS}
+ ${PROJECT_BINARY_DIR}
+ ${PROJECT_BINARY_DIR}/idl
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/MyDlgRef
+ ${CMAKE_CURRENT_BINARY_DIR}/MyDlgRef
+ ${PROJECT_SOURCE_DIR}/src/HEXABLOCK
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+ ${BOOST_DEFINITIONS}
+ ${OMNIORB_DEFINITIONS}
+ ${CAS_DEFINITIONS}
+ ${KERNEL_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+ ${CORBA_LIBS}
+ ${QT_LIBRARIES}
+ ${GEOM_SalomeIDLGEOM}
+ ${GEOM_GEOMBase}
+ ${GEOM_BasicGUI}
+ ${KERNEL_SalomeLifeCycleCORBA}
+ MyDlgRef
+ HEXABLOCKEngine
+)
+
+# --- headers ---
+
+# header files / to be processed by moc
+SET(_moc_HEADERS
+ HEXABLOCKGUI.hxx
+ HEXABLOCKGUI_VtkDocumentGraphicView.hxx
+ HEXABLOCKGUI_DocumentPanel.hxx
+ HEXABLOCKGUI_DocumentDelegate.hxx
+ HEXABLOCKGUI_DocumentSelectionModel.hxx
+ HEXABLOCKGUI_DocumentModel.hxx
+ kmodelindexproxymapper.hxx
+ klinkitemselectionmodel.hxx
+ MyBasicGUI_PointDlg.hxx
+ MyGEOMBase_Skeleton.hxx
+)
+
+# header files / no moc processing
+SET(HEXABLOCK_HEADERS
+ HEXABLOCKGUI_Export.hxx
+ HEXABLOCKGUI.hxx
+)
+
+# --- sources ---
+
+# sources / moc wrappings
+QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / static
+SET(_other_SOURCES
+ Resource.hxx
+ Resource.cxx
+ HEXABLOCKGUI_Exception.hxx
+ HEXABLOCKGUI_Exception.cxx
+ HEXABLOCKGUI_Trace.hxx
+ HEXABLOCKGUI_Trace.cxx
+ HEXABLOCKGUI_Resource.hxx
+ HEXABLOCKGUI_Resource.cxx
+ HEXABLOCKGUI_VtkDocumentGraphicView.hxx
+ HEXABLOCKGUI_VtkDocumentGraphicView.cxx
+ HEXABLOCKGUI_OccGraphicView.hxx
+ HEXABLOCKGUI_OccGraphicView.cxx
+ HEXABLOCKGUI_OCCSelector.h
+ HEXABLOCKGUI_OCCSelector.cxx
+ HEXABLOCKGUI_GraphicViewsHandler.hxx
+ HEXABLOCKGUI_GraphicViewsHandler.cxx
+ HEXABLOCKGUI_DocumentModel.hxx
+ HEXABLOCKGUI_DocumentModel.cxx
+ HEXABLOCKGUI_DocumentSelectionModel.hxx
+ HEXABLOCKGUI_DocumentSelectionModel.cxx
+ HEXABLOCKGUI_DocumentItem.hxx
+ HEXABLOCKGUI_DocumentItem.cxx
+ HEXABLOCKGUI_DocumentDelegate.hxx
+ HEXABLOCKGUI_DocumentDelegate.cxx
+ HEXABLOCKGUI_DocumentPanel.hxx
+ HEXABLOCKGUI_DocumentPanel.cxx
+ HEXABLOCKGUI_SalomeTools.hxx
+ HEXABLOCKGUI_SalomeTools.cxx
+ HEXABLOCKGUI.hxx
+ HEXABLOCKGUI.cxx
+ kmodelindexproxymapper.hxx
+ kmodelindexproxymapper.cxx
+ klinkitemselectionmodel.hxx
+ klinkitemselectionmodel.cxx
+ MyGEOMBase_Skeleton.hxx
+ MyGEOMBase_Skeleton.cxx
+ MyBasicGUI_PointDlg.hxx
+ MyBasicGUI_PointDlg.cxx
+)
+
+# uic files / to be processed by pyuic
+SET(_pyuic_files
+ Vertex_QTD.ui
+ Edge_QTD.ui
+ Quad_QTD.ui
+ Hexa_QTD.ui
+ Vector_QTD.ui
+ Cylinder_QTD.ui
+ Pipe_QTD.ui
+ MakeGrid_QTD.ui
+ MakeCylinder_QTD.ui
+ MakePipe_QTD.ui
+ MakeCylinders_QTD.ui
+ MakePipes_QTD.ui
+ RemoveHexa_QTD.ui
+ PrismQuad_QTD.ui
+ JoinQuad_QTD.ui
+ Merge_QTD.ui
+ Disconnect_QTD.ui
+ CutEdge_QTD.ui
+ Transformation_QTD.ui
+ Symmetry_QTD.ui
+ Group_QTD.ui
+ Law_QTD.ui
+ Propagation_QTD.ui
+ QuadAssoc_QTD.ui
+ EdgeAssoc_QTD.ui
+ QuadRevolution_QTD.ui
+ MakeRind_QTD.ui
+ ReplaceHexa_QTD.ui
+ MakeHemiSphere_QTD.ui
+ ModelInfo_QTD.ui
+ AddShapeDialog_QTD.ui
+)
+
+# scripts / pyuic wrappings
+QT4_WRAP_UI(_uic_HEADERS ${_pyuic_files})
+
+# sources / to compile
+SET(HEXABLOCK_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
+
+# --- resources ---
+
+# resource files / to be processed by lrelease
+SET(_ts_RESOURCES
+ resources/HEXABLOCK_msg_en.ts
+ resources/HEXABLOCK_msg_fr.ts
+ resources/HEXABLOCK_icons.ts
+)
+
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/resources/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/resources/SalomeApp.xml INSTALL ${SALOME_HEXABLOCK_INSTALL_RES_DATA})
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/resources/HEXABLOCKCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/resources/HEXABLOCKCatalog.xml INSTALL ${SALOME_HEXABLOCK_INSTALL_RES_DATA})
+
+# resource files / static
+SET(_other_RESOURCES
+ resources/LightApp.xml
+ resources/ModuleHexablock.png
+ resources/ModuleHexablock15x15.png
+ resources/new_document.png
+ resources/load_document.png
+ resources/save_document.png
+ resources/add_vertex.png
+ resources/add_edge.png
+ resources/add_quad.png
+ resources/add_hexa.png
+ resources/add_vector.png
+ resources/add_cylinder.png
+ resources/add_pipe.png
+ resources/make_grid.png
+ resources/make_cylinder.png
+ resources/make_pipe.png
+ resources/make_cylinders.png
+ resources/make_pipes.png
+ resources/remove_hexa.png
+ resources/prism_quad.png
+ resources/join_quad.png
+ resources/merge.png
+ resources/disconnect.png
+ resources/cut_edge.png
+ resources/make_transformation.png
+ resources/make_symmetry.png
+ resources/perform_transformation.png
+ resources/perform_symmetry.png
+ resources/assoc_vertex.png
+ resources/assoc_edge.png
+ resources/assoc_quad.png
+ resources/add_geom.png
+ resources/model_info.png
+ resources/add_group.png
+ resources/remove_group.png
+ resources/add_law.png
+ resources/remove_law.png
+ resources/set_propagation.png
+ resources/compute_mesh.png
+ resources/point2.png
+ resources/pointonedge.png
+ resources/select1.png
+ resources/point3.png
+ resources/point_line_intersection.png
+ resources/pointonface.png
+ resources/line.png
+ resources/build_wire.png
+ resources/quad_revolution.png
+ resources/replace_hexa.png
+ resources/make_hemisphere.png
+)
+
+# --- rules ---
+
+ADD_LIBRARY(HEXABLOCK ${HEXABLOCK_SOURCES})
+TARGET_LINK_LIBRARIES(HEXABLOCK ${_link_LIBRARIES} )
+INSTALL(TARGETS HEXABLOCK EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
+INSTALL(FILES ${HEXABLOCK_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
+
+QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HEXABLOCK_INSTALL_RES_DATA}")
+
+INSTALL(FILES ${_other_RESOURCES}
+ DESTINATION ${SALOME_HEXABLOCK_INSTALL_RES_DATA})
QDockWidget* _dw; // creator's container
private slots:
- void commitEditor();
+ //void commitEditor();
};
}
return edgeIndex;
}
+QModelIndex DocumentModel::addEdgeVector ( const QModelIndex &i_v, const QModelIndex &i_vec )
+{
+ QModelIndex edgeIndex;
+
+ HEXA_NS::Vertex* hv0 = getHexaPtr<HEXA_NS::Vertex*>(i_v);
+ HEXA_NS::Vector* hvec = getHexaPtr<HEXA_NS::Vector*>(i_vec);
+
+ HEXA_NS::Edge* he = _hexaDocument->addEdgeVector( hv0, hvec );
+ if ( BadElement(he) ) return edgeIndex;
+
+ EdgeItem* e = new EdgeItem(he, _entry);
+ _vectorDirItem->appendRow(e);
+ edgeIndex = e->index();
+ emit patternDataChanged();
+
+ return edgeIndex;
+}
+
QModelIndex DocumentModel::addQuadVertices( const QModelIndex &i_v0, const QModelIndex &i_v1,
const QModelIndex &i_v2, const QModelIndex &i_v3 )
{ //CS_TODO : gestion erreur
void updateHelpFileName();
private slots:
- void addQuad();
+ //void addQuad();
void removeQuad();
- void clearQuads();
+ //void clearQuads();
};
void updateHelpFileName();
private slots:
- void addQuad();
+ //void addQuad();
void removeQuad();
- void clearQuads();
+ //void clearQuads();
};
void _initInputWidget( Mode editmode );
protected slots:
- void updateHelpFileName();
+ //void updateHelpFileName();
void deletePropagationItem();
virtual void selectElementOfModel();
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-# salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@
-
-SUBDIRS = MyDlgRef
-
-# header files
-salomeinclude_HEADERS = \
- HEXABLOCKGUI_Export.hxx \
- HEXABLOCKGUI.hxx
-
-# Libraries targets
-lib_LTLIBRARIES = libHEXABLOCK.la
-
-dist_libHEXABLOCK_la_SOURCES = \
- Resource.hxx \
- Resource.cxx \
- HEXABLOCKGUI_Exception.hxx \
- HEXABLOCKGUI_Exception.cxx \
- HEXABLOCKGUI_Trace.hxx \
- HEXABLOCKGUI_Trace.cxx \
- HEXABLOCKGUI_Resource.hxx \
- HEXABLOCKGUI_Resource.cxx \
- HEXABLOCKGUI_VtkDocumentGraphicView.hxx \
- HEXABLOCKGUI_VtkDocumentGraphicView.cxx \
- HEXABLOCKGUI_OccGraphicView.hxx \
- HEXABLOCKGUI_OccGraphicView.cxx \
- HEXABLOCKGUI_OCCSelector.h \
- HEXABLOCKGUI_OCCSelector.cxx \
- HEXABLOCKGUI_GraphicViewsHandler.hxx \
- HEXABLOCKGUI_GraphicViewsHandler.cxx \
- HEXABLOCKGUI_DocumentModel.hxx \
- HEXABLOCKGUI_DocumentModel.cxx \
- HEXABLOCKGUI_DocumentSelectionModel.hxx \
- HEXABLOCKGUI_DocumentSelectionModel.cxx \
- HEXABLOCKGUI_DocumentItem.hxx \
- HEXABLOCKGUI_DocumentItem.cxx \
- HEXABLOCKGUI_DocumentDelegate.hxx \
- HEXABLOCKGUI_DocumentDelegate.cxx \
- HEXABLOCKGUI_DocumentPanel.hxx \
- HEXABLOCKGUI_DocumentPanel.cxx \
- HEXABLOCKGUI_SalomeTools.hxx \
- HEXABLOCKGUI_SalomeTools.cxx \
- HEXABLOCKGUI.hxx \
- HEXABLOCKGUI.cxx \
- kmodelindexproxymapper.hxx \
- kmodelindexproxymapper.cxx \
- klinkitemselectionmodel.hxx \
- klinkitemselectionmodel.cxx \
- MyGEOMBase_Skeleton.hxx \
- MyGEOMBase_Skeleton.cxx \
- MyBasicGUI_PointDlg.hxx \
- MyBasicGUI_PointDlg.cxx
-
-
-UIC_FILES = \
- ui_Vertex_QTD.h \
- ui_Edge_QTD.h \
- ui_Quad_QTD.h \
- ui_Hexa_QTD.h \
- ui_Vector_QTD.h \
- ui_Cylinder_QTD.h \
- ui_Pipe_QTD.h \
- ui_MakeGrid_QTD.h \
- ui_MakeCylinder_QTD.h \
- ui_MakePipe_QTD.h \
- ui_MakeCylinders_QTD.h \
- ui_MakePipes_QTD.h \
- ui_RemoveHexa_QTD.h \
- ui_PrismQuad_QTD.h \
- ui_JoinQuad_QTD.h \
- ui_Merge_QTD.h \
- ui_Disconnect_QTD.h \
- ui_CutEdge_QTD.h \
- ui_Transformation_QTD.h \
- ui_Symmetry_QTD.h \
- ui_Group_QTD.h \
- ui_Law_QTD.h \
- ui_Propagation_QTD.h \
- ui_QuadAssoc_QTD.h \
- ui_EdgeAssoc_QTD.h \
- ui_QuadRevolution_QTD.h \
- ui_MakeRind_QTD.h \
- ui_ReplaceHexa_QTD.h \
- ui_MakeHemiSphere_QTD.h\
- ui_ModelInfo_QTD.h\
- ui_AddShapeDialog_QTD.h
-
-
-# MOC pre-processing
-MOC_FILES = \
- HEXABLOCKGUI_moc.cxx \
- HEXABLOCKGUI_VtkDocumentGraphicView_moc.cxx \
- HEXABLOCKGUI_DocumentPanel_moc.cxx \
- HEXABLOCKGUI_DocumentDelegate_moc.cxx \
- HEXABLOCKGUI_DocumentSelectionModel_moc.cxx \
- HEXABLOCKGUI_DocumentModel_moc.cxx \
- kmodelindexproxymapper_moc.cxx \
- klinkitemselectionmodel_moc.cxx \
- MyBasicGUI_PointDlg_moc.cxx \
- MyGEOMBase_Skeleton_moc.cxx
-
-nodist_libHEXABLOCK_la_SOURCES = $(MOC_FILES) \
- $(UIC_FILES)
-
-libHEXABLOCK_la_CXXFLAGS = \
- $(THREAD_DEF) \
- $(PYTHON_CPPFLAGS) \
- $(OMNIORB_CXXFLAGS) \
- $(OMNIORB_INCLUDES) \
- $(LIBXML_INCLUDES) \
- $(BOOST_CPPFLAGS) \
- $(CAS_CPPFLAGS) \
- $(VTK_INCLUDES) \
- $(KERNEL_CXXFLAGS) \
- $(GUI_CXXFLAGS) \
- $(GEOM_CXXFLAGS) \
- -I$(srcdir)/../HEXABLOCK \
- -I$(top_builddir) \
- -I../../idl \
- $(qt4_cppflags) \
- $(qsci4_cppflags) \
- -I$(srcdir)/../HEXABLOCKGUI/MyDlgRef \
- -I$(top_builddir)/src/HEXABLOCKGUI/MyDlgRef
-
-
-
-libHEXABLOCK_la_LDFLAGS = \
- ./MyDlgRef/libMyDlgRef.la \
- ../HEXABLOCK/libHEXABLOCKEngine.la \
- -L$(GUI_ROOT_DIR)/lib/salome -lEvent -L$(KERNEL_ROOT_DIR)/lib/salome \
- $(qt4_ldflags) $(qsci4_ldflags) \
- $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \
- $(GUI_LDFLAGS) \
- $(GEOM_LDFLAGS) -lSalomeIDLGEOM -lGEOMBase -lBasicGUI \
- -lSalomeApp
-
-
-libHEXABLOCK_la_LIBADD = \
- $(qt4_libs) $(qsci4_libs) \
- -lSalomeApp
-
-BUILT_SOURCES = $(UIC_FILES)
-
-# resources files
-ICONS = \
- resources/LightApp.xml \
- resources/SalomeApp.xml \
- resources/HEXABLOCKCatalog.xml \
- resources/ModuleHexablock.png \
- resources/ModuleHexablock15x15.png\
- resources/new_document.png \
- resources/load_document.png \
- resources/save_document.png \
- resources/add_vertex.png \
- resources/add_edge.png \
- resources/add_quad.png \
- resources/add_hexa.png \
- resources/add_vector.png \
- resources/add_cylinder.png \
- resources/add_pipe.png \
- resources/make_grid.png \
- resources/make_cylinder.png \
- resources/make_pipe.png \
- resources/make_cylinders.png \
- resources/make_pipes.png \
- resources/remove_hexa.png \
- resources/prism_quad.png \
- resources/join_quad.png \
- resources/merge.png \
- resources/disconnect.png \
- resources/cut_edge.png \
- resources/make_transformation.png \
- resources/make_symmetry.png \
- resources/perform_transformation.png \
- resources/perform_symmetry.png \
- resources/assoc_vertex.png \
- resources/assoc_edge.png \
- resources/assoc_quad.png \
- resources/add_geom.png \
- resources/model_info.png \
- resources/add_group.png \
- resources/remove_group.png \
- resources/add_law.png \
- resources/remove_law.png \
- resources/set_propagation.png \
- resources/compute_mesh.png \
- resources/point2.png \
- resources/pointonedge.png \
- resources/select1.png \
- resources/point3.png \
- resources/point_line_intersection.png \
- resources/pointonface.png \
- resources/line.png \
- resources/build_wire.png \
- resources/quad_revolution.png \
- resources/replace_hexa.png \
- resources/make_hemisphere.png
-
-QMFILES = \
- HEXABLOCK_msg_en.qm \
- HEXABLOCK_msg_fr.qm \
- HEXABLOCK_icons.qm
-
-dist_salomeres_DATA = ${ICONS}
-
-nodist_salomeres_DATA = $(QMFILES)
void ClickParamCoord( int );
void onBtnPopup( QAction* );
void updateSize();
- void onRefPointChanged(const QString& pointName);
- void onStartPointSelected(const QString& pointName);
+//void onRefPointChanged(const QString& pointName);
+//void onStartPointSelected(const QString& pointName);
void onParamValueChanged(double newValue);
void onXCoordChanged(double newValue);
void onYCoordChanged(double newValue);
--- /dev/null
+# 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(
+ ${QT_INCLUDES}
+ ${GUI_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+ ${GUI_qtx}
+ ${GUI_SalomeApp}
+)
+
+# --- headers ---
+
+# header files / to be processed by moc
+SET(MyDlgRef_HEADERS
+ MyDlgRef.hxx
+)
+
+# --- sources ---
+
+# sources / moc wrappings
+QT4_WRAP_CPP(_moc_SOURCES ${MyDlgRef_HEADERS})
+
+# sources / static
+SET(_other_SOURCES
+ MyDlgRef.hxx
+ MyDlgRef.cxx
+)
+
+# uic files / to be processed by pyuic
+SET(_pyuic_files
+ DlgRef_1List1Spin1Btn_QTD.ui
+ DlgRef_1Sel1Check1List_QTD.ui
+ DlgRef_1Sel1Check1Sel_QTD.ui
+ DlgRef_1Sel1Check_QTD.ui
+ DlgRef_1Sel1List1Check3Btn_QTD.ui
+ DlgRef_1Sel1Spin1Check_QTD.ui
+ DlgRef_1Sel1Spin_QTD.ui
+ DlgRef_1Sel2Spin1View1Check_QTD.ui
+ DlgRef_1Sel2Spin_QTD.ui
+ DlgRef_1Sel3Check_QTD.ui
+ DlgRef_1Sel3Spin_QTD.ui
+ DlgRef_1Sel3Spin1Check_QTD.ui
+ DlgRef_1Sel4Spin2Check_QTD.ui
+ DlgRef_1Sel4Spin_QTD.ui
+ DlgRef_1Sel5Spin1Check_QTD.ui
+ DlgRef_1Sel5Spin_QTD.ui
+ DlgRef_1Sel_QTD.ui
+ DlgRef_1SelExt_QTD.ui
+ DlgRef_1Spin_QTD.ui
+ DlgRef_2Sel1List1Check_QTD.ui
+ DlgRef_2Sel1List2Check_QTD.ui
+ DlgRef_2Sel1List_QTD.ui
+ DlgRef_2Sel1Spin2Check_QTD.ui
+ DlgRef_2Sel1Spin_QTD.ui
+ DlgRef_2Sel1SpinInt_QTD.ui
+ DlgRef_2Sel2List_QTD.ui
+ DlgRef_2Sel2Spin1Check_QTD.ui
+ DlgRef_2Sel2Spin3Check_QTD.ui
+ DlgRef_2Sel2Spin_QTD.ui
+ DlgRef_2Sel3Spin2Rb_QTD.ui
+ DlgRef_2Sel3Spin_QTD.ui
+ DlgRef_2Sel4Spin1Check_QTD.ui
+ DlgRef_2Sel_QTD.ui
+ DlgRef_2SelExt_QTD.ui
+ DlgRef_2Spin_QTD.ui
+ DlgRef_3Check_QTD.ui
+ DlgRef_3Radio_QTD.ui
+ DlgRef_3Radio1Sel1Spin_QTD.ui
+ DlgRef_3Sel1Check_QTD.ui
+ DlgRef_3Sel1Spin_QTD.ui
+ DlgRef_3Sel2Spin_QTD.ui
+ DlgRef_3Sel3Spin1Check_QTD.ui
+ DlgRef_3Sel3Spin2Check_QTD.ui
+ DlgRef_3Sel4Spin2Check_QTD.ui
+ DlgRef_3Sel_QTD.ui
+ DlgRef_3Spin1Check_QTD.ui
+ DlgRef_3Spin_QTD.ui
+ DlgRef_4Sel1List1Check_QTD.ui
+ DlgRef_4Sel1List_QTD.ui
+ DlgRef_4Sel1Spin2Check_QTD.ui
+ DlgRef_4Sel1Spin3Check_QTD.ui
+ DlgRef_6Sel_QTD.ui
+ DlgRef_Skeleton_QTD.ui
+)
+
+# scripts / pyuic wrappings
+QT4_WRAP_UI(_uic_HEADERS ${_pyuic_files})
+
+# sources / to compile
+SET(MyDlgRef_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
+
+# --- rules ---
+
+ADD_LIBRARY(MyDlgRef ${MyDlgRef_SOURCES})
+TARGET_LINK_LIBRARIES(MyDlgRef ${_link_LIBRARIES} )
+INSTALL(TARGETS MyDlgRef EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+++ /dev/null
-# 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
-#
-
-# GEOM DLGREF :
-# File : Makefile.am
-# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
-# Package : MyDlgRef
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-# Libraries targets
-lib_LTLIBRARIES = libMyDlgRef.la
-
-# Sources files
-dist_libMyDlgRef_la_SOURCES = \
- MyDlgRef.hxx \
- MyDlgRef.cxx
-
-MOC_FILES = \
- MyDlgRef_moc.cxx
-
-UIC_FILES = \
- ui_DlgRef_1List1Spin1Btn_QTD.h \
- ui_DlgRef_1Sel1Check1List_QTD.h \
- ui_DlgRef_1Sel1Check1Sel_QTD.h \
- ui_DlgRef_1Sel1Check_QTD.h \
- ui_DlgRef_1Sel1List1Check3Btn_QTD.h \
- ui_DlgRef_1Sel1Spin1Check_QTD.h \
- ui_DlgRef_1Sel1Spin_QTD.h \
- ui_DlgRef_1Sel2Spin1View1Check_QTD.h \
- ui_DlgRef_1Sel2Spin_QTD.h \
- ui_DlgRef_1Sel3Check_QTD.h \
- ui_DlgRef_1Sel3Spin_QTD.h \
- ui_DlgRef_1Sel3Spin1Check_QTD.h \
- ui_DlgRef_1Sel4Spin2Check_QTD.h \
- ui_DlgRef_1Sel4Spin_QTD.h \
- ui_DlgRef_1Sel5Spin1Check_QTD.h \
- ui_DlgRef_1Sel5Spin_QTD.h \
- ui_DlgRef_1Sel_QTD.h \
- ui_DlgRef_1SelExt_QTD.h \
- ui_DlgRef_1Spin_QTD.h \
- ui_DlgRef_2Sel1List1Check_QTD.h \
- ui_DlgRef_2Sel1List2Check_QTD.h \
- ui_DlgRef_2Sel1List_QTD.h \
- ui_DlgRef_2Sel1Spin2Check_QTD.h \
- ui_DlgRef_2Sel1Spin_QTD.h \
- ui_DlgRef_2Sel1SpinInt_QTD.h \
- ui_DlgRef_2Sel2List_QTD.h \
- ui_DlgRef_2Sel2Spin1Check_QTD.h \
- ui_DlgRef_2Sel2Spin3Check_QTD.h \
- ui_DlgRef_2Sel2Spin_QTD.h \
- ui_DlgRef_2Sel3Spin2Rb_QTD.h \
- ui_DlgRef_2Sel3Spin_QTD.h \
- ui_DlgRef_2Sel4Spin1Check_QTD.h \
- ui_DlgRef_2Sel_QTD.h \
- ui_DlgRef_2SelExt_QTD.h \
- ui_DlgRef_2Spin_QTD.h \
- ui_DlgRef_3Check_QTD.h \
- ui_DlgRef_3Radio_QTD.h \
- ui_DlgRef_3Radio1Sel1Spin_QTD.h \
- ui_DlgRef_3Sel1Check_QTD.h \
- ui_DlgRef_3Sel1Spin_QTD.h \
- ui_DlgRef_3Sel2Spin_QTD.h \
- ui_DlgRef_3Sel3Spin1Check_QTD.h \
- ui_DlgRef_3Sel3Spin2Check_QTD.h \
- ui_DlgRef_3Sel4Spin2Check_QTD.h \
- ui_DlgRef_3Sel_QTD.h \
- ui_DlgRef_3Spin1Check_QTD.h \
- ui_DlgRef_3Spin_QTD.h \
- ui_DlgRef_4Sel1List1Check_QTD.h \
- ui_DlgRef_4Sel1List_QTD.h \
- ui_DlgRef_4Sel1Spin2Check_QTD.h \
- ui_DlgRef_4Sel1Spin3Check_QTD.h \
- ui_DlgRef_6Sel_QTD.h \
- ui_DlgRef_Skeleton_QTD.h
-
-ADVANCED_UIC_FILES =
-##@@ insert new functions before this line @@ do not remove this line @@##
-
-UIC_FILES += $(ADVANCED_UIC_FILES)
-
-BUILT_SOURCES = $(UIC_FILES)
-
-nodist_libMyDlgRef_la_SOURCES = \
- $(MOC_FILES) \
- $(UIC_FILES)
-
-# additional information to compile and link file
-
-libMyDlgRef_la_CPPFLAGS = \
- $(QT_INCLUDES) \
- $(GUI_CXXFLAGS)
-
-libMyDlgRef_la_LDFLAGS = \
- $(STDLIB) \
- $(QT_MT_LIBS) \
- $(GUI_LDFLAGS) -lqtx -lSalomeApp
<component-username>HEXABLOCK TUI</component-username>
<component-type>Data</component-type>
<component-author>CS</component-author>
- <component-version>@VERSION@</component-version>
+ <component-version>@SALOMEHEXABLOCK_VERSION@</component-version>
<component-comment>CEA - RD</component-comment>
<component-multistudy>1</component-multistudy>
<component-icone>ModuleHexablock.png</component-icone>
<!-- Major module parameters -->
<parameter name="name" value="HexaBlock"/>
<parameter name="icon" value="ModuleHexablock.png"/>
- <parameter name="version" value="@VERSION@"/>
+ <parameter name="version" value="@SALOMEHEXABLOCK_VERSION@"/>
<parameter name="documentation" value="hexablock_help"/>
</section>
<section name="hexablock_help" >
--- /dev/null
+# 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(${SWIG_USE_FILE})
+
+# --- options ---
+# additional include directories
+INCLUDE_DIRECTORIES(
+ ${KERNEL_INCLUDE_DIRS}
+ ${PYTHON_INCLUDE_DIRS}
+ ${CAS_INCLUDE_DIRS}
+ ${VTK_INCLUDE_DIRS}
+ ${GEOM_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS}
+ ${OMNIORB_INCLUDE_DIR}
+ ${PROJECT_SOURCE_DIR}/src/HEXABLOCK
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(
+ ${KERNEL_DEFINITIONS}
+ ${CAS_DEFINITIONS}
+ ${BOOST_DEFINITIONS}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+ ${PYTHON_LIBRARIES}
+ ${GEOM_GEOMBase}
+ ${CAS_TKBRep}
+ ${CAS_TKPrim}
+ ${CAS_TKG3d}
+ ${CAS_TKG2d}
+ ${CAS_TKTopAlgo}
+ ${CAS_TKGeomBase}
+ ${CAS_TKGeomAlgo}
+ ${CAS_TKBool}
+ ${CAS_TKBO}
+ ${KERNEL_SALOMELocalTrace}
+ ${KERNEL_SALOMEBasics}
+ HEXABLOCKEngine
+)
+
+# swig flags
+SET_SOURCE_FILES_PROPERTIES(hexablock_swig.i PROPERTIES CPLUSPLUS ON)
+SET_SOURCE_FILES_PROPERTIES(hexablock_swig.i PROPERTIES SWIG_DEFINITIONS "-shadow")
+
+# --- sources ---
+
+# sources / static
+SET(_hexablock_swig_SOURCES
+ hexablock_swig_wrap.cc
+)
+
+# --- scripts ---
+
+# scripts / static
+SET(_bin_SCRIPTS
+ hexablock_swig.py
+ hexablock.py
+)
+
+# --- rules ---
+
+ADD_LIBRARY(hexablock_swig_lib ${_hexablock_swig_SOURCES})
+TARGET_LINK_LIBRARIES(hexablock_swig_lib ${_link_LIBRARIES} )
+
+SWIG_ADD_MODULE(hexablock_swig python ${_hexablock_swig_SOURCES})
+SWIG_LINK_LIBRARIES(hexablock_swig ${_link_LIBRARIES} ${hexablock_swig_lib})
+INSTALL(TARGETS _hexablock_swig DESTINATION ${SALOME_INSTALL_LIBS})
+
+SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-#
-# ===============================================================
-# Files to be installed
-# ===============================================================
-#
-#
-# header files
-
-SWIG_OPTIONS = $(SWIG_PYTHON_OPT) -python -c++ -I$(srcdir)/../HEXABLOCK
-salomeinclude_HEADERS =
-
-dist_salomescript_PYTHON = hexablock_swig.py hexablock.py
-
-lib_LTLIBRARIES = _hexablock_swig.la
-
-BUILT_SOURCES = \
- hexablock_swig_wrap.cc
-
-_hexablock_swig_la_SOURCES = \
- hexablock_swig_wrap.cc hexablock_swig.i
-
-_hexablock_swig_la_CPPFLAGS = \
- $(KERNEL_CXXFLAGS) \
- $(PYTHON_CPPFLAGS) \
- $(CAS_CPPFLAGS) \
- $(VTK_INCLUDES) \
- $(GEOM_CXXFLAGS) \
- $(HEXABLOCK_CXXFLAGS) \
- $(SMESH_CXXFLAGS) \
- $(BOOST_CPPFLAGS) \
- $(CORBA_CXXFLAGS) \
- $(CORBA_INCLUDES) \
- -I$(srcdir)/../HEXABLOCK
-
-_hexablock_swig_la_LDFLAGS = -module \
- ../HEXABLOCK/libHEXABLOCKEngine.la \
- $(PYTHON_LDFLAGS) \
- $(GEOM_LDFLAGS) -lGEOMBase \
- $(CAS_KERNEL) -lTKBRep -lTKPrim -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo -lTKBool -lTKBO \
- $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics
-
-$(srcdir)/hexablock_swig_wrap.cc : hexablock_swig.i
- echo SWIG_PYTHON_OPT = $(SWIG_PYTHON_OPT)
- $(SWIG) $(SWIG_OPTIONS) -o $(srcdir)hexablock_swig_wrap.cc $(srcdir)/hexablock_swig.i
-
-hexablock_swig.py : hexablock_swig_wrap.cc
-
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-DIST_SUBDIRS = HEXABLOCK HEXABLOCK_SWIG HEXABLOCKGUI TEST_PY TEST_CPP
-
-SUBDIRS = HEXABLOCK HEXABLOCK_SWIG TEST_PY
-
-if HEXABLOCK_ENABLE_GUI
- SUBDIRS += HEXABLOCKGUI
-endif
-
-## if CPPUNIT_IS_OK
- ## SUBDIRS += TEST_CPP
-## endif
--- /dev/null
+# 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(
+ ${PROJECT_SOURCE_DIR}/src/HEXABLOCK
+ ${PROJECT_BINARY_DIR}/idl
+ ${CPPUNIT_INCLUDE_DIR}
+)
+
+# libraries to link to
+SET(_link_LIBRARIES
+ HEXABLOCKEngine
+ ${CPPUNIT_LIBRARIES}
+)
+
+ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS})
+
+# --- sources ---
+
+# sources / static
+SET(HEXABLOCKTest_SOURCES
+ test_unit.hxx
+ test_hexa1.cxx
+ test_tools.cxx
+ test_quads.cxx
+ ModelTest.cxx
+ ModelTest.hxx
+)
+
+# bin programs
+SET(Test_HEXABLOCK_bin_SOURCES
+ Test_HEXABLOCK.cxx
+)
+
+# --- rules ---
+
+ADD_LIBRARY(HEXABLOCKTest ${HEXABLOCKTest_SOURCES})
+TARGET_LINK_LIBRARIES(HEXABLOCKTest ${_link_LIBRARIES} )
+INSTALL(TARGETS HEXABLOCKTest EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+
+ADD_EXECUTABLE(Test_HEXABLOCK ${Test_HEXABLOCK_bin_SOURCES})
+TARGET_LINK_LIBRARIES(Test_HEXABLOCK ${_link_LIBRARIES} HEXABLOCKTest)
+INSTALL(TARGETS Test_HEXABLOCK EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-#
-# ===============================================================
-# Files to be installed
-# ===============================================================
-#
-# header files
-# salomeinclude_HEADERS= ../SD/VertexTest.hxx
-
-# Scripts to be installed
-
-#
-# ===============================================================
-# Local definitions
-# ===============================================================
-#
-
-# This directory defines the subdirectory src in the top source directory.
-# RPATH=../..
-RPATH=..
-
-
-# This local variable defines the list of CPPFLAGS common to all target in this package.
-COMMON_CPPFLAGS = \
- @CPPUNIT_INCLUDES@ \
- -I$(srcdir)/$(RPATH)/HEXABLOCK/ \
- -I$(top_builddir)/idl
-
-# This local variable defines the list of dependant libraries common to all target in this package.
-COMMON_LIBS =\
- @CPPUNIT_LIBS@ \
- $(RPATH)/HEXABLOCK/libHEXABLOCKEngine.la
-
-# ===============================================================
-# Libraries targets
-# HexVertexTest.cxx \
-# HexEdgeTest.cxx \
-# ===============================================================
-lib_LTLIBRARIES = libHEXABLOCKTest.la
-libHEXABLOCKTest_la_SOURCES = \
- test_unit.hxx \
- test_hexa1.cxx \
- test_tools.cxx \
- test_quads.cxx \
- ModelTest.cxx ModelTest.hxx
-
-libHEXABLOCKTest_la_CPPFLAGS = $(COMMON_CPPFLAGS)
-libHEXABLOCKTest_la_LDFLAGS = -no-undefined -version-info=0:0:0
-libHEXABLOCKTest_la_LIBADD = $(COMMON_LIBS)
-
-
-# ===============================================================
-# Executables targets
-# ===============================================================
-bin_PROGRAMS = Test_HEXABLOCK
-Test_HEXABLOCK_SOURCES = Test_HEXABLOCK.cxx
-Test_HEXABLOCK_CPPFLAGS = $(COMMON_CPPFLAGS)
-Test_HEXABLOCK_LDADD = \
- libHEXABLOCKTest.la \
- ../HEXABLOCK/libHEXABLOCKEngine.la \
- $(COMMON_LIBS)
-
-UNIT_TEST_PROG = ./Test_HEXABLOCK
-
-check : tests
-
-clean-local:
- -rm -fr *.vtk *.xml *.brep
-
-# bin_PROGRAMS = bielle
-# test_hexa1 \
-# test_cartesi1 \
-# test_clone \
-# test_cyl \
-# test_decoupage \
-# test_find \
-# test_gen_xml \
-# test_joint \
-# test_propagation \
-# test_separ \
-# tuyau
-# test_lecture
-
-
-# UNIT TEST
-# test_cartesi1_SOURCES = test_cartesi1.cpp
-# test_cartesi1_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_cartesi1_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-# test_clone_SOURCES = test_clone.cpp
-# test_clone_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_clone_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-# test_cyl_SOURCES = test_cyl.cpp
-# test_cyl_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_cyl_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-# test_decoupage_SOURCES = test_decoupage.cpp
-# test_decoupage_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_decoupage_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-# test_find_SOURCES = test_find.cpp
-# test_find_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_find_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-# test_gen_xml_SOURCES = test_gen_xml.cpp
-# test_gen_xml_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_gen_xml_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-# test_joint_SOURCES = test_joint.cpp
-# test_joint_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_joint_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-
-# test_lecture_SOURCES = test_lecture.cpp
-# test_lecture_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_lecture_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-
-# test_propagation_SOURCES = test_propagation.cpp
-# test_propagation_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_propagation_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-#
-# test_separ_SOURCES = test_separ.cpp
-# test_separ_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_separ_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-
-
-
-# test_hexa1_SOURCES = test_hexa1.cpp
-# test_hexa1_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_hexa1_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-#
-# UNIT_TEST_PROG = ./test_hexa1
-
-# libHEXATest.la \
-# USER CASE
-# bielle_SOURCES = bielle.cpp
-# bielle_CPPFLAGS = $(COMMON_CPPFLAGS)
-# bielle_LDADD = \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
-
-# tuyau_SOURCES = tuyau.cpp
-# tuyau_CPPFLAGS = $(COMMON_CPPFLAGS)
-# tuyau_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAEngine.la \
-# $(COMMON_LIBS)
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-#
-# ===============================================================
-# Files to be installed
-# ===============================================================
-#
-# header files
-# salomeinclude_HEADERS= ../SD/VertexTest.hxx
-
-# Scripts to be installed
-
-
-#
-# ===============================================================
-# Local definitions
-# ===============================================================
-#
-
-# This directory defines the subdirectory src in the top source directory.
-# RPATH=../..
-RPATH=..
-
-
-# This local variable defines the list of CPPFLAGS common to all target in this package.
-COMMON_CPPFLAGS = \
- @CPPUNIT_INCLUDES@ \
- -I$(srcdir)/$(RPATH)/HEXA/ \
- -I$(top_builddir)/idl \
- @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
-
-
-# This local variable defines the list of dependant libraries common to all target in this package.
-COMMON_LIBS =\
- @CPPUNIT_LIBS@ \
- $(RPATH)/HEXA/libHEXAimpl.la \
- $(KERNEL_LDFLAGS) \
- -lSalomeGenericObj
-
-# ===============================================================
-# Libraries targets
-# ===============================================================
-# HexVertexTest.cxx \
-# HexEdgeTest.cxx
-#
-# lib_LTLIBRARIES = libHEXATest.la
-# libHEXATest_la_SOURCES = \
-# test_hexa1.cxx
-#
-#
-# libHEXATest_la_CPPFLAGS = $(COMMON_CPPFLAGS)
-# libHEXATest_la_LDFLAGS = -no-undefined -version-info=0:0:0
-# libHEXATest_la_LIBADD = $(COMMON_LIBS)
-
-#
-# ===============================================================
-# Executables targets
-# ===============================================================
-#
-# bin_PROGRAMS = TestHEXA
-# TestHEXA_SOURCES = TestHEXA.cxx
-# TestHEXA_CPPFLAGS = $(COMMON_CPPFLAGS)
-# TestHEXA_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# UNIT_TEST_PROG = ./TestHEXA
-#
-#
-
-
-bin_PROGRAMS = bielle
-# test_hexa1 \
-# test_cartesi1 \
-# test_clone \
-# test_cyl \
-# test_decoupage \
-# test_find \
-# test_gen_xml \
-# test_joint \
-# test_propagation \
-# test_separ \
-# tuyau
-# test_lecture
-
-
-# UNIT TEST
-# test_cartesi1_SOURCES = test_cartesi1.cpp
-# test_cartesi1_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_cartesi1_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# test_clone_SOURCES = test_clone.cpp
-# test_clone_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_clone_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# test_cyl_SOURCES = test_cyl.cpp
-# test_cyl_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_cyl_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# test_decoupage_SOURCES = test_decoupage.cpp
-# test_decoupage_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_decoupage_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# test_find_SOURCES = test_find.cpp
-# test_find_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_find_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# test_gen_xml_SOURCES = test_gen_xml.cpp
-# test_gen_xml_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_gen_xml_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# test_joint_SOURCES = test_joint.cpp
-# test_joint_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_joint_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-
-# test_lecture_SOURCES = test_lecture.cpp
-# test_lecture_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_lecture_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-
-# test_propagation_SOURCES = test_propagation.cpp
-# test_propagation_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_propagation_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-#
-# test_separ_SOURCES = test_separ.cpp
-# test_separ_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_separ_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-
-
-
-# test_hexa1_SOURCES = test_hexa1.cpp
-# test_hexa1_CPPFLAGS = $(COMMON_CPPFLAGS)
-# test_hexa1_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-#
-# UNIT_TEST_PROG = ./test_hexa1
-
-# libHEXATest.la \
-# USER CASE
-bielle_SOURCES = bielle.cpp
-bielle_CPPFLAGS = $(COMMON_CPPFLAGS)
-bielle_LDADD = \
- ../HEXA/libHEXAimpl.la \
- $(COMMON_LIBS)
-
-# tuyau_SOURCES = tuyau.cpp
-# tuyau_CPPFLAGS = $(COMMON_CPPFLAGS)
-# tuyau_LDADD = \
-# libHEXATest.la \
-# ../HEXA/libHEXAimpl.la \
-# $(COMMON_LIBS)
-
-
-
--- /dev/null
+# 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
+#
+
+# --- scripts ---
+
+# scripts / static
+SET(_bin_SCRIPTS
+ foo.py
+)
+
+# --- rules ---
+SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_BINS})
\ No newline at end of file
+++ /dev/null
-# Copyright (C) 2009-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
-#
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-#
-# ===============================================================
-# Files to be installed
-# ===============================================================
-
-# Scripts to be installed
-# dist_salomescript_PYTHON = foo
-dist_salomescript_PYTHON = foo.py
-dist_salomescript_DATA =
-
