From 5e9eeec7697fc9ca58e7ed34f3a6dacc41f2da15 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 11 Oct 2013 06:54:59 +0000 Subject: [PATCH] Porting HOMARD SALOME module to the CMake build system: initial version. --- CMakeLists.txt | 244 ++++++++++ HOMARD_version.h.in | 20 +- Makefile.am | 53 --- SalomeHOMARDConfig.cmake.in | 101 +++++ adm_local/{Makefile.am => CMakeLists.txt} | 10 +- .../cmake_files/CMakeLists.txt | 22 +- adm_local/cmake_files/FindSalomeHOMARD.cmake | 31 ++ .../unix/CMakeLists.txt | 4 +- adm_local/unix/config_files/CMakeLists.txt | 29 ++ adm_local/unix/make_common_starter.am | 86 ---- .../Makefile.am => bin/CMakeLists.txt | 20 +- bin/VERSION.in | 4 +- build_configure | 113 ----- clean_configure | 29 -- configure.ac | 421 ------------------ src/Makefile.am => doc/CMakeLists.txt | 13 +- doc/en/CMakeLists.txt | 93 ++++ doc/en/Makefile.am | 102 ----- doc/en/conf.py.in | 2 +- doc/fr/CMakeLists.txt | 93 ++++ doc/fr/Makefile.am | 102 ----- doc/fr/conf.py.in | 2 +- idl/CMakeLists.txt | 47 ++ idl/Makefile.am | 122 ----- resources/CMakeLists.txt | 86 ++++ resources/Makefile.am | 83 ---- resources/SalomeApp.xml.in | 2 +- .../unix/Makefile.am => src/CMakeLists.txt | 22 +- src/HOMARD/CMakeLists.txt | 74 +++ src/HOMARD/Makefile.am | 58 --- src/HOMARDGUI/CMakeLists.txt | 180 ++++++++ src/HOMARDGUI/HOMARDGUI.h | 1 - src/HOMARDGUI/HOMARDGUI_Utils.h | 2 +- src/HOMARDGUI/Makefile.am | 165 ------- src/HOMARD_I/CMakeLists.txt | 85 ++++ src/HOMARD_I/Makefile.am | 84 ---- .../HOMARD_SCRIPTS/CMakeLists.txt | 13 +- .../HOMARD_SWIG/CMakeLists.txt | 15 +- tests/CMakeLists.txt | 45 ++ tests/Makefile.am | 53 --- 40 files changed, 1195 insertions(+), 1536 deletions(-) create mode 100755 CMakeLists.txt delete mode 100644 Makefile.am create mode 100644 SalomeHOMARDConfig.cmake.in rename adm_local/{Makefile.am => CMakeLists.txt} (76%) mode change 100644 => 100755 rename src/HOMARD_SWIG/Makefile.am => adm_local/cmake_files/CMakeLists.txt (70%) mode change 100644 => 100755 create mode 100644 adm_local/cmake_files/FindSalomeHOMARD.cmake rename doc/Makefile.am => adm_local/unix/CMakeLists.txt (89%) mode change 100644 => 100755 create mode 100755 adm_local/unix/config_files/CMakeLists.txt delete mode 100644 adm_local/unix/make_common_starter.am rename src/HOMARD_SCRIPTS/Makefile.am => bin/CMakeLists.txt (73%) mode change 100644 => 100755 delete mode 100755 build_configure delete mode 100755 clean_configure delete mode 100644 configure.ac rename src/Makefile.am => doc/CMakeLists.txt (77%) create mode 100755 doc/en/CMakeLists.txt delete mode 100644 doc/en/Makefile.am create mode 100755 doc/fr/CMakeLists.txt delete mode 100644 doc/fr/Makefile.am create mode 100755 idl/CMakeLists.txt delete mode 100644 idl/Makefile.am create mode 100755 resources/CMakeLists.txt delete mode 100644 resources/Makefile.am rename adm_local/unix/Makefile.am => src/CMakeLists.txt (74%) mode change 100644 => 100755 create mode 100644 src/HOMARD/CMakeLists.txt delete mode 100755 src/HOMARD/Makefile.am create mode 100644 src/HOMARDGUI/CMakeLists.txt delete mode 100644 src/HOMARDGUI/Makefile.am create mode 100644 src/HOMARD_I/CMakeLists.txt delete mode 100644 src/HOMARD_I/Makefile.am rename bin/Makefile.am => src/HOMARD_SCRIPTS/CMakeLists.txt (77%) rename adm_local/unix/config_files/Makefile.am => src/HOMARD_SWIG/CMakeLists.txt (76%) create mode 100755 tests/CMakeLists.txt delete mode 100644 tests/Makefile.am diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100755 index 00000000..c57cda28 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,244 @@ +# 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(SalomeHOMARD C CXX) + +# Ensure a proper linker behavior: +CMAKE_POLICY(SET CMP0003 NEW) + +# Versioning +# =========== +# Project name, upper case +STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) + +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_VERSION + ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) + +# Find KERNEL +# =========== +SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") +IF(EXISTS ${KERNEL_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") + INCLUDE(SalomeMacros) + FIND_PACKAGE(SalomeKERNEL REQUIRED) +ELSE(EXISTS ${KERNEL_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") +ENDIF(EXISTS ${KERNEL_ROOT_DIR}) + +IF(SALOME_LIGHT_ONLY) + MESSAGE(FATAL_ERROR "HOMARD module can't be built in Light mode (without CORBA)") +ENDIF() + +# Platform setup +# ============== +INCLUDE(SalomeSetupPlatform) # From KERNEL +# Always build libraries as shared objects: +SET(BUILD_SHARED_LIBS TRUE) +# Local macros: +LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") + +# User options +# (some options have already been defined in KERNEL) +# ============ +OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) +OPTION(SALOME_BUILD_DOC "Generate SALOME HOMARD documentation" ${SALOME_BUILD_DOC}) + +## +## From KERNEL: +## + +# Python +FIND_PACKAGE(SalomePython REQUIRED) +# Boost +FIND_PACKAGE(SalomeBoost REQUIRED) +# CORBA +FIND_PACKAGE(SalomeOmniORB REQUIRED) +FIND_PACKAGE(SalomeOmniORBPy REQUIRED) +# HDF5 +FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C) +# MedFile +FIND_PACKAGE(SalomeMEDFile 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 +# =========== +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 REQUIRED) +ELSE(EXISTS ${GUI_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR") +ENDIF(EXISTS ${GUI_ROOT_DIR}) + +## +## From GUI: +## + +# Various +# Qt4 +FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) +# SIP +FIND_PACKAGE(SalomeSIP REQUIRED) +# PyQt4 +FIND_PACKAGE(SalomePyQt4 REQUIRED) + +# Find GEOM +# =========== + +SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM") +IF(EXISTS ${GEOM_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeGEOM REQUIRED) +ELSE(EXISTS ${GEOM_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR") +ENDIF(EXISTS ${GEOM_ROOT_DIR}) + +# Find SMESH +# =========== + +SET(SMESH_ROOT_DIR $ENV{SMESH_ROOT_DIR} CACHE PATH "Path to the Salome SMESH") +IF(EXISTS ${SMESH_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeSMESH REQUIRED) +ELSE(EXISTS ${SMESH_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR") +ENDIF(EXISTS ${SMESH_ROOT_DIR}) + +## +## HOMARD specifics +## + +# OCCT +FIND_PACKAGE(SalomeCAS REQUIRED) + +# Detection summary: +SALOME_PACKAGE_REPORT_AND_CHECK() + +# Directories +# (default values taken from KERNEL) +# =========== +SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries") +SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_IDLS "${SALOME_INSTALL_IDLS}" CACHE PATH "Install path: SALOME IDL files") +SET(SALOME_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "Install path: SALOME headers") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH + "Install path: SALOME scripts") +SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH + "Install path: SALOME script data") +SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH + "Install path: SALOME Python scripts") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH + "Install path: SALOME application skeleton - scripts") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH + "Install path: SALOME application skeleton - Python") +SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff") +SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH + "Install path: SALOME Python shared modules") +SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH + "Install path: local SALOME CMake files") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH + "Install path: local SALOME config files (obsolete, to be removed)") +SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") +SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") + +# Specific to HOMARD: +SET(SALOME_HOMARD_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/homard" CACHE PATH + "Install path: SALOME HOMARD 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_HOMARD_INSTALL_RES_DATA) + +# Sources +# ======== + +ADD_SUBDIRECTORY(idl) +ADD_SUBDIRECTORY(adm_local) +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(bin) +IF(SALOME_BUILD_TESTS) + ADD_SUBDIRECTORY(tests) +ENDIF(SALOME_BUILD_TESTS) +IF(SALOME_BUILD_DOC) + ADD_SUBDIRECTORY(doc) +ENDIF(SALOME_BUILD_DOC) + +# Header configuration +# ==================== +SALOME_XVERSION(${PROJECT_NAME}) +SALOME_CONFIGURE_FILE(HOMARD_version.h.in HOMARD_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 + HOMARDImpl HOMARDEngine HOMARD SalomeIDLHOMARD +) + +# Add all targets to the build-tree export set +EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} + FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake) + +# Create the configuration files: +# - in the build tree: + +# Ensure the variables are always defined for the configure: +SET(SMESH_ROOT_DIR "${SMESH_ROOT_DIR}") + +SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") +CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in + ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" + PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX + SMESH_ROOT_DIR) + +WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake + VERSION ${${PROJECT_NAME_UC}_VERSION} + COMPATIBILITY AnyNewerVersion) + +# Install the CMake configuration files: +INSTALL(FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}") + +# Install the export set for use with the install-tree +INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" + FILE ${PROJECT_NAME}Targets.cmake) diff --git a/HOMARD_version.h.in b/HOMARD_version.h.in index 479ed1cd..9db2cd16 100644 --- a/HOMARD_version.h.in +++ b/HOMARD_version.h.in @@ -24,12 +24,22 @@ #if !defined(__HOMARD_VERSION_H__) #define __HOMARD_VERSION_H__ -/* - HOMARD_VERSION is (major << 16) + (minor << 8) + patch. +/*! + Specify version of SALOME HOMARD module, as follows + + HOMARD_VERSION_MAJOR : (integer) number identifying major version + HOMARD_VERSION_MINOR : (integer) number identifying minor version + HOMARD_VERSION_MAINTENANCE : (integer) number identifying maintenance version + HOMARD_VERSION_STR : (string) complete version number "major.minor.maintenance" + HOMARD_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + HOMARD_DEVELOPMENT : (integer) indicates development version when set to 1 */ -#define HOMARD_VERSION_STR "@VERSION@" -#define HOMARD_VERSION @XVERSION@ -#define HOMARD_DEVELOPMENT @VERSION_DEV@ +#define HOMARD_VERSION_MAJOR @SALOMEHOMARD_MAJOR_VERSION@ +#define HOMARD_VERSION_MINOR @SALOMEHOMARD_MINOR_VERSION@ +#define HOMARD_VERSION_MAINTENANCE @SALOMEHOMARD_PATCH_VERSION@ +#define HOMARD_VERSION_STR "@SALOMEHOMARD_VERSION@" +#define HOMARD_VERSION @SALOMEHOMARD_XVERSION@ +#define HOMARD_DEVELOPMENT @SALOMEHOMARD_VERSION_DEV@ #endif // __HOMARD_VERSION_H__ diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 974d38b2..00000000 --- a/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2011-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 -# - -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -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 ${SMESH_ROOT_DIR}/adm_local/unix/config_files - -SUBDIRS = idl adm_local resources src bin doc tests - -DIST_SUBDIRS = idl adm_local resources src bin doc tests - -DISTCLEANFILES = a.out aclocal.m4 configure hack_libtool - -salomeinclude_DATA = HOMARD_version.h - -EXTRA_DIST += \ - build_configure \ - clean_configure - -dist-hook: - rm -rf `find $(distdir) -name CVS` - -usr_docs: - (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs:usr_docs - -dev_docs: - (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/SalomeHOMARDConfig.cmake.in b/SalomeHOMARDConfig.cmake.in new file mode 100644 index 00000000..360b1152 --- /dev/null +++ b/SalomeHOMARDConfig.cmake.in @@ -0,0 +1,101 @@ +# - 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 HOMARDEngine AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(HOMARD_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(HOMARD_INCLUDE_DIRS "${HOMARD_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") + +#### Now the specificities + +# Options exported by the package: +SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@) + +# Level 1 prerequisites: +SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_SMESH_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_IDLS "@SALOME_INSTALL_IDLS@") +SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") +SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") +SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") +SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") +SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") +SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") + +# Include SMESH targets if they were not already loaded: +IF(NOT (TARGET SMESHEngine)) + INCLUDE("${SMESH_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeSMESHTargets.cmake") +ENDIF() + +# Exposed HOMARD targets: +SET(HOMARD_HOMARDImpl HOMARDImpl) +SET(HOMARD_HOMARDEngine HOMARDEngine) +SET(HOMARD_HOMARD HOMARD) +SET(HOMARD_SalomeIDLHOMARD SalomeIDLHOMARD) diff --git a/adm_local/Makefile.am b/adm_local/CMakeLists.txt old mode 100644 new mode 100755 similarity index 76% rename from adm_local/Makefile.am rename to adm_local/CMakeLists.txt index ac41a1d3..84d97c22 --- a/adm_local/Makefile.am +++ b/adm_local/CMakeLists.txt @@ -1,4 +1,7 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,6 +20,5 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = unix +ADD_SUBDIRECTORY(unix) +ADD_SUBDIRECTORY(cmake_files) diff --git a/src/HOMARD_SWIG/Makefile.am b/adm_local/cmake_files/CMakeLists.txt old mode 100644 new mode 100755 similarity index 70% rename from src/HOMARD_SWIG/Makefile.am rename to adm_local/cmake_files/CMakeLists.txt index 9ab74ee7..d237cf70 --- a/src/HOMARD_SWIG/Makefile.am +++ b/adm_local/cmake_files/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,23 +16,13 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Nicolas REJNERI, Paul RASCLE -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : HOMARD - - -# Libraries targets -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am # =============================================================== # Files to be installed # =============================================================== -# - -# Scripts to be installed. -dist_salomescript_DATA = -sharedpkgpython_PYTHON = \ - HOMARD_shared_modules.py +# These files are data, module or lib files +SET(_adm_data + FindSalomeHOMARD.cmake +) +INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindSalomeHOMARD.cmake b/adm_local/cmake_files/FindSalomeHOMARD.cmake new file mode 100644 index 00000000..27e35796 --- /dev/null +++ b/adm_local/cmake_files/FindSalomeHOMARD.cmake @@ -0,0 +1,31 @@ +# 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 SalomeHOMARD_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome HOMARD ...") +ENDIF() + +SET(CMAKE_PREFIX_PATH "${HOMARD_ROOT_DIR}") + +SALOME_FIND_PACKAGE(SalomeHOMARD SalomeHOMARD CONFIG) + +IF(NOT SalomeHOMARD_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome HOMARD: ${HOMARD_ROOT_DIR}") +ENDIF() diff --git a/doc/Makefile.am b/adm_local/unix/CMakeLists.txt old mode 100644 new mode 100755 similarity index 89% rename from doc/Makefile.am rename to adm_local/unix/CMakeLists.txt index afc1c8be..2f895ae4 --- a/doc/Makefile.am +++ b/adm_local/unix/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,4 +17,4 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SUBDIRS = en fr +ADD_SUBDIRECTORY(config_files) diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt new file mode 100755 index 00000000..44b6c418 --- /dev/null +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -0,0 +1,29 @@ +# 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_GUI.m4 + check_Med2.m4 + check_sphinx.m4 +) + +INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am deleted file mode 100644 index 1e894694..00000000 --- a/adm_local/unix/make_common_starter.am +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (C) 2011-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: %.h - $(MOC) $< -o $@ - -# translation (*.qm) files generation (lrelease) -%.qm: %.ts - $(LRELEASE) $< -qm $@ - -# resource files generation (qrcc) -qrc_%.cxx: %.qrc - $(QRCC) $< -o $@ -name $(*F) - -# qt forms files generation (uic) -ui_%.h: %.ui - $(UIC) -o $@ $< - -# extra distributed files -EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) - -# customize clean operation -mostlyclean-local: - rm -f @builddir@/*_moc.cxx - rm -f @builddir@/*.qm - rm -f @builddir@/ui_*.h - rm -f @builddir@/qrc_*.cxx - -# tests -tests: unittest - -unittest: $(UNIT_TEST_PROG) - @if test "x$(UNIT_TEST_PROG)" != "x"; then \ - $(UNIT_TEST_PROG); \ - fi; diff --git a/src/HOMARD_SCRIPTS/Makefile.am b/bin/CMakeLists.txt old mode 100644 new mode 100755 similarity index 73% rename from src/HOMARD_SCRIPTS/Makefile.am rename to bin/CMakeLists.txt index 4aaf59c9..9dfd01bc --- a/src/HOMARD_SCRIPTS/Makefile.am +++ b/bin/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,20 +16,16 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Nicolas REJNERI, Paul RASCLE -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : HOMARD - -# Libraries targets -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am +SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) +SALOME_CONFIGURE_FILE(runAppli.in runAppli INSTALL ${SALOME_INSTALL_BINS}) # =============================================================== # Files to be installed # =============================================================== -# -# Scripts to be installed. -dist_salomescript_DATA = test_homard.py +SET(_bin_scripts + runSalome.py +) + +SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) \ No newline at end of file diff --git a/bin/VERSION.in b/bin/VERSION.in index 9cdb4761..f2923eaa 100644 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ -[SALOME HOMARD] : @VERSION@ -[DEVELOPMENT] : @VERSION_DEV@ +[SALOME HOMARD] : @SALOMEHOMARD_VERSION@ +[DEVELOPMENT] : @SALOMEHOMARD_VERSION_DEV@ diff --git a/build_configure b/build_configure deleted file mode 100755 index a8e2f91d..00000000 --- a/build_configure +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# Copyright (C) 2011-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 -# - -# Tool for updating list of .in file for the SALOME project -# and regenerating configure script -# Author : -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Date : 10/10/2002 -# -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 : $KERNEL_ROOT_DIR" - 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 : $GUI_ROOT_DIR" - exit -fi - - -######################################################################## -# Test if the SMESH_ROOT_DIR is set correctly - -if test ! -d "${SMESH_ROOT_DIR}"; then - echo "failed : SMESH_ROOT_DIR variable is not correct : $SMESH_ROOT_DIR" - exit -fi - -######################################################################## - -cd ${CONF_DIR} -ABS_CONF_DIR=`pwd` - - -# ____________________________________________________________________ -# aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory adm_local/unix/config_files -# and KERNEL config_files directory. -# output: -# aclocal.m4 -# autom4te.cache (directory) -echo "====================================================== aclocal" - -aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1 - -# ____________________________________________________________________ -# libtoolize creates some configuration files (ltmain.sh, -# config.guess and config.sub). It only depends on the libtool -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). -# output: -# adm_local/unix/config_files/config.guess -# adm_local/unix/config_files/config.sub -# adm_local/unix/config_files/ltmain.sh -#echo "====================================================== libtoolize" - -libtoolize --force --copy --automake || exit 1 - -# ____________________________________________________________________ -# autoconf creates the configure script from the file configure.ac (or -# configure.in if configure.ac doesn't exist) -# output: -# configure -echo "====================================================== autoconf" - -autoconf - -# ____________________________________________________________________ -# automake creates some scripts used in building process -# (install-sh, missing, ...). It only depends on the automake -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also -# creates the Makefile.in files from the Makefile.am files. -# output: -# adm_local/unix/config_files/compile -# adm_local/unix/config_files/depcomp -# adm_local/unix/config_files/install-sh -# adm_local/unix/config_files/missing -# adm_local/unix/config_files/py-compile -# Makefile.in (from Makefile.am) -echo "====================================================== automake" - -automake --copy --gnu --add-missing diff --git a/clean_configure b/clean_configure deleted file mode 100755 index d253b213..00000000 --- a/clean_configure +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# Copyright (C) 2011-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 \$\(top_srcdir\) -find . -name "*~" -print -exec rm {} \; -find . -name "*.pyc" -print -exec rm {} \; -#exit -# ==================== ON SORT AVANT - -# Files created by libtoolize and automake -( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile install-sh missing depcomp py-compile ) -find . -name Makefile.in | xargs rm -f -rm -f COPYING INSTALL diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 48dd075b..00000000 --- a/configure.ac +++ /dev/null @@ -1,421 +0,0 @@ -# Copyright (C) 2011-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 -# -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Created from configure.in.base -# -AC_INIT([Salome2 Project HOMARD module], [7.2.0], [webmaster.salome@opencascade.com], [SalomeHOMARD]) -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=homard -AC_SUBST(MODULE_NAME) - -echo -echo --------------------------------------------- -echo Initialize source and build root directories -echo --------------------------------------------- -echo - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! - -echo -echo --------------------------------------------- -echo Coniguring production -echo --------------------------------------------- -echo -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='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_CXX_WARNINGS -AC_CXX_TEMPLATE_OPTIONS -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -echo -echo --------------------------------------------- -echo testing Fortran -echo --------------------------------------------- -echo - -fortran_ok=no -AC_PROG_F77 -AC_F77_LIBRARY_LDFLAGS -AC_PROG_FC -AC_FC_LIBRARY_LDFLAGS -if test "X$FC" != "X" ; then - fortran_ok=yes - F77=$FC -fi - -dnl AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) - -echo - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -dnl -dnl Well we use sstream which is not in gcc pre-2.95.3 -dnl We must test if it exists. If not, add it in include ! -dnl - -AC_CXX_HAVE_SSTREAM - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -AM_PATH_PYTHON(2.3) -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -HOMARD_WITH_GUI=yes - -AM_CONDITIONAL(HOMARD_ENABLE_GUI, [test "${HOMARD_WITH_GUI}" = "yes"]) - -if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then - echo - echo --------------------------------------------- - echo testing omniORB - echo --------------------------------------------- - echo - - CHECK_OMNIORB - - echo - echo --------------------------------------------- - echo default ORB : omniORB - echo --------------------------------------------- - echo - - DEFAULT_ORB=omniORB - - echo - echo --------------------------------------------- - echo testing Corba - echo --------------------------------------------- - echo - - CHECK_CORBA - - AC_SUBST_FILE(CORBA) - corba=make_$ORB - CORBA=adm_local/unix/$corba - -fi - -if test "${HOMARD_WITH_GUI}" = "yes"; then - echo - echo --------------------------------------------- - echo testing openGL - echo --------------------------------------------- - echo - - CHECK_OPENGL - - echo - echo --------------------------------------------- - echo testing QT - echo --------------------------------------------- - echo - - CHECK_QT - - echo - echo --------------------------------------------- - echo Testing GUI - echo --------------------------------------------- - echo - - CHECK_SALOME_GUI - - echo - echo --------------------------------------------- - echo Testing full GUI - echo --------------------------------------------- - echo - - CHECK_CORBA_IN_GUI - if test "x${CORBA_IN_GUI}" != "xyes"; then - echo "failed : For configure HOMARD module necessary full GUI !" - exit - fi -fi - -echo -echo --------------------------------------------- -echo testing MPI -echo --------------------------------------------- -echo - -CHECK_MPI - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing Med library -echo --------------------------------------------- -echo - -CHECK_MED3 - - -echo -echo --------------------------------------------- -echo Testing Smesh -echo --------------------------------------------- -echo - -CHECK_SMESH - - -echo -echo --------------------------------------------- -echo Testing sphinx -echo --------------------------------------------- -echo - -CHECK_SPHINX - - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -if test "${HOMARD_WITH_GUI}" = "yes"; then -variables="cc_ok fortran_ok boost_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok hdf5_ok omniORB_ok Kernel_ok med3_ok SalomeGUI_ok SMesh_ok sphinx_ok" -fi - -if test "${HOMARD_WITH_GUI}" = "no"; then -variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok sphinx_ok" -fi - -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 We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -dnl AM_CONDITIONAL(GUI_ENABLE_CORBA, [test "$GUI_DISABLE_CORBA" = no]) -dnl AM_CONDITIONAL(ENABLE_PYCONSOLE, [test "$DISABLE_PYCONSOLE" = no]) -dnl AM_CONDITIONAL(ENABLE_GLVIEWER, [test "$DISABLE_GLVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_PLOT2DVIEWER, [test "$DISABLE_PLOT2DVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_SUPERVGRAPHVIEWER, [test "$DISABLE_SUPERVGRAPHVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_OCCVIEWER, [test "$DISABLE_OCCVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) - -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -#AC_OUTPUT_COMMANDS([ \ -# chmod +x ./bin/*; \ -# chmod +x ./bin/salome/*; \ -#]) - -AC_HACK_LIBTOOL -AC_CONFIG_COMMANDS([hack_libtool],[ - sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ - $(pwd)/hack_libtool \1 \"\$[@]\" \n\ - }\n\ - CC=\"hack_libtool\"%g" libtool - sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool - sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool - sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool - ],[]) - -# This list is initiated using autoscan and must be updated manually -# when adding a new file .in to manage. When you execute -# autoscan, the Makefile list is generated in the output file configure.scan. -# This could be helpfull to update de configuration. -AC_OUTPUT([ \ - Makefile \ - idl/Makefile \ - adm_local/Makefile \ - adm_local/unix/Makefile \ - adm_local/unix/config_files/Makefile \ - bin/Makefile \ - bin/VERSION \ - doc/Makefile \ - doc/en/conf.py \ - doc/en/Makefile \ - doc/fr/conf.py \ - doc/fr/Makefile \ - HOMARD_version.h \ - src/Makefile \ - src/HOMARD_I/Makefile \ - src/HOMARD/Makefile \ - src/HOMARDGUI/Makefile \ - src/HOMARD_SWIG/Makefile \ - resources/Makefile \ - resources/HOMARDCatalog.xml \ - resources/SalomeApp.xml \ - tests/Makefile \ -]) diff --git a/src/Makefile.am b/doc/CMakeLists.txt similarity index 77% rename from src/Makefile.am rename to doc/CMakeLists.txt index 90fe85a4..5d3bb7be 100755 --- a/src/Makefile.am +++ b/doc/CMakeLists.txt @@ -1,4 +1,7 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,8 +19,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -SUBDIRS = HOMARD HOMARD_I HOMARDGUI HOMARD_SWIG + +ADD_SUBDIRECTORY(en) +ADD_SUBDIRECTORY(fr) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt new file mode 100755 index 00000000..989053e2 --- /dev/null +++ b/doc/en/CMakeLists.txt @@ -0,0 +1,93 @@ +# 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(SPHINXBUILD + sphinx-build +) + +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(WINDOWS) + 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(WINDOWS) + 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(WINDOWS) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") + +ADD_CUSTOM_TARGET(html_docs_en ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINXBUILD} -c ${PROJECT_BINARY_DIR}/doc/en -b html ${CMAKE_CURRENT_SOURCE_DIR} html) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_en)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_INSTALL_DOC}/gui/HOMARD/en) diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am deleted file mode 100644 index 45ff7dfe..00000000 --- a/doc/en/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (C) 2011-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 -# - -homarddoc_langue=en -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if SPHINX_IS_OK - -homarddoc_DATA=html/index.html -html/index.html:$(RSTFILES) dummy - -dummy: - make htm - make latex - -endif - -homarddocdir=$(docdir)/gui/HOMARD/$(homarddoc_langue) - -SPHINXOPTS = -SPHINXBUILD = sphinx-build - -htm: -# mkdir -p html doctrees - mkdir -p html - $(SPHINXBUILD) $(SPHINXOPTS) -c $(top_builddir)/doc/$(homarddoc_langue) -b html $(srcdir) html - @echo - @echo "Build finished. The HTML pages are in html." - -latex: -# mkdir -p latex doctrees - mkdir -p latex - $(SPHINXBUILD) $(SPHINXOPTS) -c $(top_builddir)/doc/$(homarddoc_langue) -b latex $(srcdir) latex - @echo - @echo "Build finished. The pages are in latex." - @echo "Go into latex and apply twice : pdflatex HOMARD.tex to produce HOMARD.pdf" - -RSTFILES= \ -index.rst \ -glossaire.rst \ -gui_create_boundary.rst \ -gui_create_case.rst \ -gui_create_hypothese.rst \ -gui_create_iteration.rst \ -gui_create_zone.rst \ -gui_homard.rst \ -gui_usage.rst \ -gui_mesh_info.rst \ -intro.rst \ -tui_create_boundary.rst \ -tui_create_case.rst \ -tui_create_hypothese.rst \ -tui_create_iteration.rst \ -tui_create_zone.rst \ -tui_homard.rst \ -tui_usage.rst \ -tutorials.rst \ -gui_create_yacs.rst \ -gui_create_yacs_aster.rst \ -tui_create_yacs.rst - -EXTRA_DIST += $(RSTFILES) images ../images ../files - -usr_docs: - make install-data-local - -docs: usr_docs - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(homarddocdir) - if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ - if test -d $$b"html"; then cp -rf $$b"html"/* $(DESTDIR)$(homarddocdir); fi; - -uninstall-local: - chmod -R +w $(DESTDIR)$(homarddocdir) - rm -rf $(DESTDIR)$(homarddocdir)/* - -clean-local: - -rm -rf doctrees - if test -d "html"; then rm -rf html ; fi - if test -d "latex"; then rm -rf latex ; 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 diff --git a/doc/en/conf.py.in b/doc/en/conf.py.in index 2fe1d54e..0f9920b5 100644 --- a/doc/en/conf.py.in +++ b/doc/en/conf.py.in @@ -47,7 +47,7 @@ copyright = u'1996, 2011, 2013, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret' # The short X.Y version. version = '@SHORT_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@VERSION@' +release = '@SALOMEHOMARD_VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt new file mode 100755 index 00000000..71828b7c --- /dev/null +++ b/doc/fr/CMakeLists.txt @@ -0,0 +1,93 @@ +# 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(SPHINXBUILD + sphinx-build +) + +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(WINDOWS) + 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(WINDOWS) + 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(WINDOWS) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") + +ADD_CUSTOM_TARGET(html_docs_fr ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINXBUILD} -c ${PROJECT_BINARY_DIR}/doc/fr -b html ${CMAKE_CURRENT_SOURCE_DIR} html) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_fr)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION ${SALOME_INSTALL_DOC}/gui/HOMARD/fr) \ No newline at end of file diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am deleted file mode 100644 index 4b143a5c..00000000 --- a/doc/fr/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (C) 2011-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 -# - -homarddoc_langue=fr -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if SPHINX_IS_OK - -homarddoc_DATA=html/index.html -html/index.html:$(RSTFILES) dummy - -dummy: - make htm - make latex - -endif - -homarddocdir=$(docdir)/gui/HOMARD/$(homarddoc_langue) - -SPHINXOPTS = -SPHINXBUILD = sphinx-build - -htm: -# mkdir -p html doctrees - mkdir -p html - $(SPHINXBUILD) $(SPHINXOPTS) -c $(top_builddir)/doc/$(homarddoc_langue) -b html $(srcdir) html - @echo - @echo "Build fini. Les pages HTML sont dans html." - -latex: -# mkdir -p latex doctrees - mkdir -p latex - $(SPHINXBUILD) $(SPHINXOPTS) -c $(top_builddir)/doc/$(homarddoc_langue) -b latex $(srcdir) latex - @echo - @echo "Build fini. Les pages sont en latex." - @echo "Aller dans latex et appliquer deux fois : pdflatex HOMARD.tex pour produire HOMARD.pdf" - -RSTFILES= \ -index.rst \ -glossaire.rst \ -gui_create_boundary.rst \ -gui_create_case.rst \ -gui_create_hypothese.rst \ -gui_create_iteration.rst \ -gui_create_zone.rst \ -gui_homard.rst \ -gui_usage.rst \ -gui_mesh_info.rst \ -intro.rst \ -tui_create_boundary.rst \ -tui_create_case.rst \ -tui_create_hypothese.rst \ -tui_create_iteration.rst \ -tui_create_zone.rst \ -tui_homard.rst \ -tui_usage.rst \ -tutorials.rst \ -gui_create_yacs.rst \ -gui_create_yacs_aster.rst \ -tui_create_yacs.rst - -EXTRA_DIST += $(RSTFILES) images ../images ../files - -usr_docs: - make install-data-local - -docs: usr_docs - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(homarddocdir) - if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ - if test -d $$b"html"; then cp -rf $$b"html"/* $(DESTDIR)$(homarddocdir); fi; - -uninstall-local: - chmod -R +w $(DESTDIR)$(homarddocdir) - rm -rf $(DESTDIR)$(homarddocdir)/* - -clean-local: - -rm -rf doctrees - if test -d "html"; then rm -rf html ; fi - if test -d "latex"; then rm -rf latex ; 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 diff --git a/doc/fr/conf.py.in b/doc/fr/conf.py.in index 10096c9c..b68d4faa 100644 --- a/doc/fr/conf.py.in +++ b/doc/fr/conf.py.in @@ -47,7 +47,7 @@ copyright = u'1996, 2011, 2013, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret' # The short X.Y version. version = '@SHORT_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@VERSION@' +release = '@SALOMEHOMARD_VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt new file mode 100755 index 00000000..59f77ce2 --- /dev/null +++ b/idl/CMakeLists.txt @@ -0,0 +1,47 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseOmniORB) # Provided by KERNEL + +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl +) + +SET(SalomeIDLHOMARD_IDLSOURCES + HOMARD_Gen.idl + HOMARD_Cas.idl + HOMARD_Hypothesis.idl + HOMARD_Iteration.idl + HOMARD_Zone.idl + HOMARD_Boundary.idl + HOMARD_YACS.idl +) + +SET(_idl_include_dirs + ${KERNEL_ROOT_DIR}/idl/salome +) + +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} +) + +OMNIORB_ADD_MODULE(SalomeIDLHOMARD "${SalomeIDLHOMARD_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLHOMARD EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/idl/Makefile.am b/idl/Makefile.am deleted file mode 100644 index 93fa93ce..00000000 --- a/idl/Makefile.am +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright (C) 2011-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 Makefile is responsible of generating the client and server -# implementation of IDL interfaces for both C++ and python usage. -# The building process of the C++ files is in charge of each source -# package and then is not manage here. -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -BASEIDL_FILES = HOMARD_Gen.idl HOMARD_Cas.idl HOMARD_Hypothesis.idl HOMARD_Iteration.idl HOMARD_Zone.idl HOMARD_Boundary.idl HOMARD_YACS.idl - -BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) - -# This variable defines the files to be installed -dist_salomeidl_DATA = $(BASEIDL_FILES) - -# GUI idl common library -lib_LTLIBRARIES = libSalomeIDLHOMARD.la - -# Sources built from idl files -nodist_libSalomeIDLHOMARD_la_SOURCES = \ - HOMARD_CasSK.cc \ - HOMARD_ZoneSK.cc \ - HOMARD_HypothesisSK.cc \ - HOMARD_IterationSK.cc \ - HOMARD_BoundarySK.cc \ - HOMARD_GenSK.cc \ - HOMARD_YACSSK.cc - -BUILT_SOURCES = $(nodist_libSalomeIDLHOMARD_la_SOURCES) - -# header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) - -libSalomeIDLHOMARD_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/adm_local/unix \ - -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ \ - @CORBA_INCLUDES@ - -libSalomeIDLHOMARD_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLHOMARD_la_LIBADD = \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ - @CORBA_LIBS@ - -# These variables defines the building process of CORBA files -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = \ - @OMNIORB_IDLPYFLAGS@ \ - -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome - -IDLCXXFLAGS = \ - -bcxx \ - @IDLCXXFLAGS@ \ - -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(top_builddir)/adm_local/unix -IDLPYFLAGS = \ - @IDLPYFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome - -# potential problem on parallel make on the following - multiple outputs -SUFFIXES = .idl .hh SK.cc -.idlSK.cc: - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< -#.idl.hh: -# $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) - $(INSTALL) -d $(DESTDIR)$(salomepythondir) - ls $^ | while read file; do \ - $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ - done - -# we want to remove only staff generated for IDL files and nothing more -uninstall-local: - @for modulen in HOMARD ; do \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ - done ; \ - for filen in $(BASEIDL_FILES_PY) ; do \ - echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ - done - -mostlyclean-local: - -rm -f *.hh *.cc .depidl - -# we use cpp to generate dependencies between idl files. -# option x c tells the preprocessor to consider idl as a c file. -# if an idl is modified, all idl dependencies are rebuilt - -.depidl: $(BASEIDL_FILES) - @echo "" > $@ - @for dep in $^ dummy; do \ - if [ $$dep != "dummy" ]; then \ - echo Building dependencies for $$dep; \ - $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ - sed 's/\.o/\SK.cc/' >>$@; \ - fi; \ - done ; - --include .depidl diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt new file mode 100755 index 00000000..58bf62b2 --- /dev/null +++ b/resources/CMakeLists.txt @@ -0,0 +1,86 @@ +# 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(HOMARD_RESOURCES_FILES + advanced_mesh_info.png + boxdxy.png + boxdxy_2.png + boxdxyz.png + boxdxyz_2.png + cas_calcule.png + cas_non_calcule.png + conedxyz.png + cone.png + conepointvector.png + cylinderpointvector.png + cylinderpointvector_2.png + delete.png + drapeau_en.gif + drapeau_fr.gif + disk.png + disk_2.png + diskwithhole.png + diskwithhole_2.png + full_view.png + HOMARD.png + HOMARD_2.png + hypotheses.png + iter0.png + iter_calculee.png + iter_next.png + iter_non_calculee.png + iter_poursuite.png + loop.png + med.png + mesh_compute.png + mesh_hypo_edit.png + mesh_tree_mesh.png + mesh_tree_importedmesh.png + mesh_whatis.png + pipe.png + pipe_2.png + save.png + schema.png + spherepoint.png + spherepoint_2.png + table_view.png + texte.png + texte_2.png + triangle.png + whatis.png + write.png + yacs.png + yacs_01.fr.xml + yacs_01.en.xml + zone_boxdxyz.png + zone_boxdxyz_2.png + zone_icone.png + zone_icone_2.png + zone_spherepoint.png + zone_spherepoint_2.png + zones.png +) + +INSTALL(FILES ${HOMARD_RESOURCES_FILES} DESTINATION ${SALOME_HOMARD_INSTALL_RES_DATA}) + +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_HOMARD_INSTALL_RES_DATA}) +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/HOMARDCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/HOMARDCatalog.xml INSTALL ${SALOME_HOMARD_INSTALL_RES_DATA}) diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index ec2f09e9..00000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (C) 2011-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_salomeres_DATA = \ - $(top_builddir)/resources/SalomeApp.xml \ - advanced_mesh_info.png \ - boxdxy.png \ - boxdxy_2.png \ - boxdxyz.png \ - boxdxyz_2.png \ - cas_calcule.png \ - cas_non_calcule.png \ - conedxyz.png \ - cone.png \ - conepointvector.png \ - cylinderpointvector.png \ - cylinderpointvector_2.png \ - delete.png \ - drapeau_en.gif \ - drapeau_fr.gif \ - disk.png \ - disk_2.png \ - diskwithhole.png \ - diskwithhole_2.png \ - full_view.png \ - HOMARD.png \ - HOMARD_2.png \ - hypotheses.png \ - iter0.png \ - iter_calculee.png \ - iter_next.png \ - iter_non_calculee.png \ - iter_poursuite.png \ - loop.png \ - med.png \ - mesh_compute.png \ - mesh_hypo_edit.png \ - mesh_tree_mesh.png \ - mesh_tree_importedmesh.png \ - mesh_whatis.png \ - pipe.png \ - pipe_2.png \ - save.png \ - schema.png \ - spherepoint.png \ - spherepoint_2.png \ - table_view.png \ - texte.png \ - texte_2.png \ - triangle.png \ - whatis.png \ - write.png \ - yacs.png \ - yacs_01.fr.xml \ - yacs_01.en.xml \ - zone_boxdxyz.png \ - zone_boxdxyz_2.png \ - zone_icone.png \ - zone_icone_2.png \ - zone_spherepoint.png \ - zone_spherepoint_2.png \ - zones.png - -# VSR: little trick to avoid putting if HOMARDCatalog.xml to the distribution archive -nodist_salomeres_SCRIPTS = HOMARDCatalog.xml diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index fef71ce2..17159b89 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -24,7 +24,7 @@ - + diff --git a/adm_local/unix/Makefile.am b/src/CMakeLists.txt old mode 100644 new mode 100755 similarity index 74% rename from adm_local/unix/Makefile.am rename to src/CMakeLists.txt index 467b297a..1fcc8af1 --- a/adm_local/unix/Makefile.am +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,22 @@ # # 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 +## +# Common packages +## +SET(SUBDIRS_COMMON + HOMARD + HOMARD_I + HOMARDGUI + HOMARD_SWIG +) + +SET(SUBDIRS + ${SUBDIRS_COMMON} +) + +FOREACH(dir ${SUBDIRS}) + ADD_SUBDIRECTORY(${dir}) +ENDFOREACH(dir ${SUBDIRS}) + diff --git a/src/HOMARD/CMakeLists.txt b/src/HOMARD/CMakeLists.txt new file mode 100644 index 00000000..de819ba9 --- /dev/null +++ b/src/HOMARD/CMakeLists.txt @@ -0,0 +1,74 @@ +# 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} +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${KERNEL_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SALOMELocalTrace} +) + +# --- headers --- + +# header files +SET(HOMARDImpl_HEADERS + HOMARD_Cas.hxx + HOMARD_Boundary.hxx + HOMARD_Hypothesis.hxx + HOMARD_Iteration.hxx + HOMARD_Zone.hxx + HOMARD_Gen.hxx + HOMARD_DriverTools.hxx + HOMARD_YACS.hxx + HomardDriver.hxx + YACSDriver.hxx +) + +# --- sources --- + +# sources / static +SET(HOMARDImpl_SOURCES + HOMARD_Cas.cxx + HOMARD_Boundary.cxx + HOMARD_Hypothesis.cxx + HOMARD_Iteration.cxx + HOMARD_Zone.cxx + HOMARD_Gen.cxx + HOMARD_DriverTools.cxx + HOMARD_YACS.cxx + HomardDriver.cxx + YACSDriver.cxx +) + +# --- rules --- + +ADD_LIBRARY(HOMARDImpl ${HOMARDImpl_SOURCES}) +TARGET_LINK_LIBRARIES(HOMARDImpl ${_link_LIBRARIES} ) +INSTALL(TARGETS HOMARDImpl EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${HOMARDImpl_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/HOMARD/Makefile.am b/src/HOMARD/Makefile.am deleted file mode 100755 index 09422f9f..00000000 --- a/src/HOMARD/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - HOMARD_Cas.hxx \ - HOMARD_Boundary.hxx \ - HOMARD_Hypothesis.hxx \ - HOMARD_Iteration.hxx \ - HOMARD_Zone.hxx \ - HOMARD_Gen.hxx \ - HOMARD_DriverTools.hxx \ - HOMARD_YACS.hxx \ - HomardDriver.hxx \ - YACSDriver.hxx - -# Libraries targets -lib_LTLIBRARIES = libHOMARDImpl.la -dist_libHOMARDImpl_la_SOURCES = \ - HOMARD_Cas.cxx \ - HOMARD_Boundary.cxx \ - HOMARD_Hypothesis.cxx \ - HOMARD_Iteration.cxx \ - HOMARD_Zone.cxx \ - HOMARD_Gen.cxx \ - HOMARD_DriverTools.cxx \ - HOMARD_YACS.cxx \ - HomardDriver.cxx \ - YACSDriver.cxx - -libHOMARDImpl_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) - -libHOMARDImpl_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) \ - -lSALOMELocalTrace - diff --git a/src/HOMARDGUI/CMakeLists.txt b/src/HOMARDGUI/CMakeLists.txt new file mode 100644 index 00000000..5fc8bec0 --- /dev/null +++ b/src/HOMARDGUI/CMakeLists.txt @@ -0,0 +1,180 @@ +# 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(UseQt4Ext) +INCLUDE(UsePyQt4) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${CAS_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/adm_local/unix + ${PROJECT_SOURCE_DIR}/src/HOMARD + ${PROJECT_SOURCE_DIR}/src/HOMARD_I +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${BOOST_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${CAS_DEFINITIONS} + ${KERNEL_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${MEDFILE_C_LIBRARIES} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_SalomeDS} + ${GUI_SalomeApp} + SalomeIDLHOMARD + HOMARDEngine +) + +# --- headers --- + +# header files / to be processed by moc +SET(_moc_HEADERS + HOMARDGUI.h + MonCreateBoundaryAn.h + MonEditBoundaryAn.h + MonCreateBoundaryDi.h + MonEditBoundaryDi.h + MonCreateCase.h + MonEditCase.h + MonCreateZone.h + MonEditZone.h + MonCreateHypothesis.h + MonEditHypothesis.h + MonCreateListGroup.h + MonEditListGroup.h + MonCreateIteration.h + MonEditIteration.h + MonPursueIteration.h + MonMeshInfo.h + MonIterInfo.h + MonCreateYACS.h + MonEditYACS.h + MonEditFile.h +) + +# header files / no moc processing +SET(_other_HEADERS + CreateBoundaryAn.h + CreateBoundaryDi.h + CreateCase.h + CreateZone.h + CreateHypothesis.h + CreateListGroup.h + CreateIteration.h + PursueIteration.h + MeshInfo.h + IterInfo.h + CreateYACS.h + HOMARDGUI_Utils.h + EditFile.h + HomardQtCommun.h +) + +# header files / to install +SET(HOMARD_HEADERS ${_other_HEADERS} ${_moc_HEADERS}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +# sources / static +SET(_other_SOURCES + HOMARDGUI.cxx + HOMARDGUI_Utils.cxx + MonCreateBoundaryAn.cxx + MonEditBoundaryAn.cxx + MonCreateBoundaryDi.cxx + MonEditBoundaryDi.cxx + MonCreateCase.cxx + MonEditCase.cxx + MonCreateHypothesis.cxx + MonEditHypothesis.cxx + MonCreateListGroup.cxx + MonEditListGroup.cxx + MonCreateIteration.cxx + MonEditIteration.cxx + MonPursueIteration.cxx + MonCreateZone.cxx + MonEditZone.cxx + MonMeshInfo.cxx + MonIterInfo.cxx + MonCreateYACS.cxx + MonEditYACS.cxx + MonEditFile.cxx + HomardQtCommun.cxx +) + +# sources / to compile +SET(HOMARD_SOURCES ${_other_SOURCES} ${_moc_SOURCES}) + +# --- resources --- + +# resource files / to be processed by lrelease +SET(_ts_RESOURCES + HOMARD_msg_en.ts + HOMARD_msg_fr.ts + HOMARD_msg_ja.ts +) + +# no install files +# uic files / to be processed by pyuic +SET(_pyuic_files + CreateBoundaryAn.ui + CreateBoundaryDi.ui + CreateCase.ui + CreateHypothesis.ui + CreateIteration.ui + CreateListGroup.ui + CreateZone.ui + PursueIteration.ui + MeshInfo.ui + IterInfo.ui + CreateYACS.ui + EditFile.ui +) + +# scripts / pyuic wrappings +PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) + +# --- rules --- + +ADD_LIBRARY(HOMARD ${HOMARD_SOURCES}) +TARGET_LINK_LIBRARIES(HOMARD ${_link_LIBRARIES} ) +INSTALL(TARGETS HOMARD EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${HOMARD_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_HOMARD_INSTALL_RES_DATA}") diff --git a/src/HOMARDGUI/HOMARDGUI.h b/src/HOMARDGUI/HOMARDGUI.h index c6ac8bf6..dd7954b6 100644 --- a/src/HOMARDGUI/HOMARDGUI.h +++ b/src/HOMARDGUI/HOMARDGUI.h @@ -69,7 +69,6 @@ private slots: void YACSWrite(); void Edit(); void Delete(); - void XmGraceFichier(); public: virtual void contextMenuPopup( const QString&, QMenu*, QString& ); diff --git a/src/HOMARDGUI/HOMARDGUI_Utils.h b/src/HOMARDGUI/HOMARDGUI_Utils.h index c3febcba..ed50d74b 100644 --- a/src/HOMARDGUI/HOMARDGUI_Utils.h +++ b/src/HOMARDGUI/HOMARDGUI_Utils.h @@ -23,7 +23,7 @@ #include -#include +#include #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include CORBA_CLIENT_HEADER(HOMARD_Gen) diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am deleted file mode 100644 index a4212b35..00000000 --- a/src/HOMARDGUI/Makefile.am +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright (C) 2011-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 -# -# Author : -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -# header files - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -salomeinclude_HEADERS = \ - MonCreateBoundaryAn.h \ - CreateBoundaryAn.h \ - MonEditBoundaryAn.h \ - MonCreateBoundaryDi.h \ - CreateBoundaryDi.h \ - MonEditBoundaryDi.h \ - MonCreateCase.h \ - CreateCase.h \ - MonEditCase.h \ - MonCreateZone.h \ - CreateZone.h \ - MonEditZone.h \ - MonCreateHypothesis.h \ - CreateHypothesis.h \ - MonEditHypothesis.h \ - MonCreateListGroup.h \ - CreateListGroup.h \ - MonEditListGroup.h \ - MonCreateIteration.h \ - CreateIteration.h \ - MonEditIteration.h \ - MonPursueIteration.h \ - PursueIteration.h \ - MonMeshInfo.h \ - MeshInfo.h \ - MonIterInfo.h \ - IterInfo.h \ - MonCreateYACS.h \ - CreateYACS.h \ - MonEditYACS.h \ - HOMARDGUI.h \ - HOMARDGUI_Utils.h \ - EditFile.h \ - MonEditFile.h \ - HomardQtCommun.h - - -# Libraries targets -lib_LTLIBRARIES = libHOMARD.la - -dist_libHOMARD_la_SOURCES = \ - HOMARDGUI.cxx \ - HOMARDGUI_Utils.cxx \ - MonCreateBoundaryAn.cxx \ - MonEditBoundaryAn.cxx \ - MonCreateBoundaryDi.cxx \ - MonEditBoundaryDi.cxx \ - MonCreateCase.cxx \ - MonEditCase.cxx \ - MonCreateHypothesis.cxx \ - MonEditHypothesis.cxx \ - MonCreateListGroup.cxx \ - MonEditListGroup.cxx \ - MonCreateIteration.cxx \ - MonEditIteration.cxx \ - MonPursueIteration.cxx \ - MonCreateZone.cxx \ - MonEditZone.cxx \ - MonMeshInfo.cxx \ - MonIterInfo.cxx \ - MonCreateYACS.cxx \ - MonEditYACS.cxx \ - MonEditFile.cxx \ - HomardQtCommun.cxx - -# MOC pre-processing -MOC_FILES = \ - HOMARDGUI_moc.cxx \ - MonCreateBoundaryAn_moc.cxx \ - MonEditBoundaryAn_moc.cxx \ - MonCreateBoundaryDi_moc.cxx \ - MonEditBoundaryDi_moc.cxx \ - MonCreateCase_moc.cxx \ - MonEditCase_moc.cxx \ - MonCreateZone_moc.cxx \ - MonEditZone_moc.cxx \ - MonCreateHypothesis_moc.cxx \ - MonEditHypothesis_moc.cxx \ - MonCreateListGroup_moc.cxx \ - MonEditListGroup_moc.cxx \ - MonCreateIteration_moc.cxx \ - MonEditIteration_moc.cxx \ - MonPursueIteration_moc.cxx \ - MonMeshInfo_moc.cxx \ - MonIterInfo_moc.cxx \ - MonCreateYACS_moc.cxx \ - MonEditYACS_moc.cxx \ - MonEditFile_moc.cxx - -nodist_libHOMARD_la_SOURCES = $(MOC_FILES) - -libHOMARD_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(MED3_INCLUDES) \ - $(HDF5_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - -I$(srcdir)/../HOMARD \ - -I$(srcdir)/../HOMARD_I \ - -I$(top_builddir)/idl \ - -I$(top_builddir) \ - -I$(top_builddir)/adm_local/unix - -libHOMARD_la_LDFLAGS = \ - ../../idl/libSalomeIDLHOMARD.la \ - ../HOMARD_I/libHOMARDEngine.la \ - $(KERNEL_LDFLAGS) \ - $(MED3_LIBS_C_ONLY) \ - -lSalomeLifeCycleCORBA \ - $(GUI_LDFLAGS) \ - -lSalomeApp \ - -lSalomePyQtGUI - -# resources files -nodist_salomeres_DATA = \ - HOMARD_msg_en.qm \ - HOMARD_msg_fr.qm \ - HOMARD_msg_ja.qm - -UI_FILES = \ -CreateBoundaryAn.ui \ -CreateBoundaryDi.ui \ -CreateCase.ui \ -CreateHypothesis.ui \ -CreateIteration.ui \ -CreateListGroup.ui \ -CreateZone.ui \ -PursueIteration.ui \ -MeshInfo.ui \ -IterInfo.ui \ -CreateYACS.ui \ -EditFile.ui - -EXTRA_DIST += $(UI_FILES) diff --git a/src/HOMARD_I/CMakeLists.txt b/src/HOMARD_I/CMakeLists.txt new file mode 100644 index 00000000..95b3af9d --- /dev/null +++ b/src/HOMARD_I/CMakeLists.txt @@ -0,0 +1,85 @@ +# 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( + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${SMESH_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/adm_local/unix + ${PROJECT_SOURCE_DIR}/src/HOMARD + ${PROJECT_SOURCE_DIR}/src/HOMARDGUI +) + +# libraries to link to +SET(_link_LIBRARIES + ${MEDFILE_C_LIBRARIES} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_Registry} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_TOOLSDS} + ${KERNEL_SalomeGenericObj} + ${SMESH_SalomeIDLSMESH} + SalomeIDLHOMARD + HOMARDImpl +) + +# --- headers --- + +# header files / no moc processing +SET(HOMARDEngine_HEADERS + HOMARD_Cas_i.hxx + HOMARD_Hypothesis_i.hxx + HOMARD_Iteration_i.hxx + HOMARD_Zone_i.hxx + HOMARD_Gen_i.hxx + HOMARD_Boundary_i.hxx + HOMARD_YACS_i.hxx + HomardMedCommun.h +) + +# --- sources --- + +# sources / static +SET(HOMARDEngine_SOURCES + HOMARD_Cas_i.cxx + HOMARD_Hypothesis_i.cxx + HOMARD_Iteration_i.cxx + HOMARD_Gen_i.cxx + HOMARD_Zone_i.cxx + HOMARD_Boundary_i.cxx + HOMARD_YACS_i.cxx + HomardMedCommun.cxx +) + +# --- rules --- + +ADD_LIBRARY(HOMARDEngine ${HOMARDEngine_SOURCES}) +TARGET_LINK_LIBRARIES(HOMARDEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS HOMARDEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${HOMARDEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) \ No newline at end of file diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am deleted file mode 100644 index 79bce682..00000000 --- a/src/HOMARD_I/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : HOMARD -# $Header$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - HOMARD_Cas_i.hxx \ - HOMARD_Hypothesis_i.hxx \ - HOMARD_Iteration_i.hxx \ - HOMARD_Zone_i.hxx \ - HOMARD_Gen_i.hxx \ - HOMARD_Boundary_i.hxx \ - HOMARD_YACS_i.hxx \ - HomardMedCommun.h - -# Libraries targets - -lib_LTLIBRARIES = libHOMARDEngine.la - -dist_libHOMARDEngine_la_SOURCES = \ - HOMARD_Cas_i.cxx \ - HOMARD_Hypothesis_i.cxx \ - HOMARD_Iteration_i.cxx \ - HOMARD_Gen_i.cxx \ - HOMARD_Zone_i.cxx \ - HOMARD_Boundary_i.cxx \ - HOMARD_YACS_i.cxx \ - HomardMedCommun.cxx - - - -# additionnal information to compil and link file -libHOMARDEngine_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(MED3_INCLUDES) \ - $(SMESH_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - -I$(srcdir)/../HOMARD \ - -I$(srcdir)/../HOMARDGUI \ - -I$(top_builddir) \ - -I$(top_builddir)/idl \ - -I$(GEOM_ROOT_DIR)/include/salome \ - -I$(SMESH_ROOT_DIR)/include/salome \ - -I$(top_builddir)/adm_local/unix - - -libHOMARDEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLHOMARD.la \ - ../HOMARD/libHOMARDImpl.la \ - $(KERNEL_LDFLAGS) \ - $(MED3_LIBS_C_ONLY) \ - -lSalomeContainer \ - -lSalomeNS \ - -lRegistry \ - -lSalomeHDFPersist \ - -lSalomeLifeCycleCORBA \ - -lTOOLSDS \ - -lSalomeGenericObj \ - $(SMESH_LDFLAGS) \ - -lSalomeIDLSMESH diff --git a/bin/Makefile.am b/src/HOMARD_SCRIPTS/CMakeLists.txt similarity index 77% rename from bin/Makefile.am rename to src/HOMARD_SCRIPTS/CMakeLists.txt index 0a7e972b..38fd6266 100644 --- a/bin/Makefile.am +++ b/src/HOMARD_SCRIPTS/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,12 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- scripts --- -nodist_salomescript_DATA = \ - VERSION +# scripts / static +SET(_bin_SCRIPTS + test_homard.py +) + +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON}) \ No newline at end of file diff --git a/adm_local/unix/config_files/Makefile.am b/src/HOMARD_SWIG/CMakeLists.txt similarity index 76% rename from adm_local/unix/config_files/Makefile.am rename to src/HOMARD_SWIG/CMakeLists.txt index 9ba61ebc..f647121e 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/src/HOMARD_SWIG/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,9 +17,12 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- scripts --- -dist_admlocalm4_DATA = \ -check_GUI.m4 \ -check_Med2.m4 \ -check_sphinx.m4 +# scripts / static +SET(_swig_SCRIPTS + HOMARD_shared_modules.py +) + +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/shared_modules) \ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100755 index 00000000..8fc65a12 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,45 @@ +# 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(HOMARD_TEST_FILES + test_1.pdf + test_1.en.pdf + test_1.py + test_1.00.med + test_1.01.med + test_1.02.med + test_1.apad.03.bilan + test_2.pdf + test_2.en.pdf + test_2.py + test_2.00.med + test_2.fr.med + test_2.apad.03.bilan + test_3.pdf + test_3.en.pdf + test_3.py + test_3.00.med + test_3.fr.med + test_3.apad.02.bilan +) + +INSTALL(FILES ${HOMARD_TEST_FILES} DESTINATION ${SALOME_HOMARD_INSTALL_RES_DATA}) diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 2cdc7681..00000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2011-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_salomeres_DATA = \ - test_1.pdf \ - test_1.en.pdf \ - test_1.py \ - test_1.00.med \ - test_1.01.med \ - test_1.02.med \ - test_1.apad.03.bilan \ - test_2.pdf \ - test_2.en.pdf \ - test_2.py \ - test_2.00.med \ - test_2.fr.med \ - test_2.apad.03.bilan \ - test_3.pdf \ - test_3.en.pdf \ - test_3.py \ - test_3.00.med \ - test_3.fr.med \ - test_3.apad.02.bilan - -EXTRA_DIST += \ - test_1.odt \ - test_1.en.odt \ - test_1.png \ - test_2.odt \ - test_2.en.odt \ - test_2.png \ - test_3.odt \ - test_3.en.odt \ - test_3.png -- 2.39.2