From 74999949f9b63fdd92a81fe9d73c4b3f87eb8d46 Mon Sep 17 00:00:00 2001 From: Renaud Barate Date: Thu, 13 Mar 2014 08:19:04 +0000 Subject: [PATCH] Porting to CMake --- AUTHORS | 0 CMakeLists.txt | 151 ++++++++++++++ ChangeLog | 0 INSTALL | 0 NEWS | 0 README | 0 SalomeGENERICSOLVERConfig.cmake.in | 107 ++++++++++ adm_local/unix/Makefile.am | 21 -- adm_local/unix/config_files/Makefile.am | 22 -- .../unix/config_files/check_GENERICSOLVER.m4 | 71 ------- adm_local/unix/make_common_starter.am | 85 -------- build_configure | 87 -------- clean_configure | 25 --- configure.ac | 197 ------------------ Makefile.am => idl/CMakeLists.txt | 31 +-- idl/Makefile.am | 66 ------ resources/{Makefile.am => CMakeLists.txt} | 26 +-- ...atalog.xml.in => GENERICSOLVERCatalog.xml} | 5 - resources/SalomeApp.xml.in | 2 +- adm_local/Makefile.am => src/CMakeLists.txt | 6 +- .../CMakeLists.txt} | 17 +- src/GENERICSOLVER/Makefile.am | 27 --- .../CMakeLists.txt} | 12 +- 23 files changed, 314 insertions(+), 644 deletions(-) delete mode 100644 AUTHORS create mode 100644 CMakeLists.txt delete mode 100644 ChangeLog delete mode 100644 INSTALL delete mode 100644 NEWS delete mode 100644 README create mode 100644 SalomeGENERICSOLVERConfig.cmake.in delete mode 100644 adm_local/unix/Makefile.am delete mode 100644 adm_local/unix/config_files/Makefile.am delete mode 100644 adm_local/unix/config_files/check_GENERICSOLVER.m4 delete mode 100644 adm_local/unix/make_common_starter.am delete mode 100755 build_configure delete mode 100755 clean_configure delete mode 100644 configure.ac rename Makefile.am => idl/CMakeLists.txt (56%) delete mode 100644 idl/Makefile.am rename resources/{Makefile.am => CMakeLists.txt} (55%) rename resources/{GENERICSOLVERCatalog.xml.in => GENERICSOLVERCatalog.xml} (94%) rename adm_local/Makefile.am => src/CMakeLists.txt (87%) rename src/{GENERICSOLVERGUI/Makefile.am => GENERICSOLVER/CMakeLists.txt} (77%) delete mode 100644 src/GENERICSOLVER/Makefile.am rename src/{Makefile.am => GENERICSOLVERGUI/CMakeLists.txt} (81%) diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..b9d74a7 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,151 @@ +# Copyright (C) 2009-2014 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 +# + +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) +PROJECT(SalomeGENERICSOLVER 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 4) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_VERSION + ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) + +# Find KERNEL +# =========== +SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") +IF(EXISTS ${KERNEL_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") + INCLUDE(SalomeMacros) + FIND_PACKAGE(SalomeKERNEL REQUIRED) +ELSE(EXISTS ${KERNEL_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") +ENDIF(EXISTS ${KERNEL_ROOT_DIR}) + +# Platform setup +# ============== +INCLUDE(SalomeSetupPlatform) # From KERNEL +# Always build libraries as shared objects: +SET(BUILD_SHARED_LIBS TRUE) + +## +## From KERNEL: +## +FIND_PACKAGE(SalomePython REQUIRED) +FIND_PACKAGE(SalomeOmniORB REQUIRED) +FIND_PACKAGE(SalomeOmniORBPy REQUIRED) + +# 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") + +# GENERICSOLVER specific: +SET(SALOME_GENERICSOLVER_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/genericsolver" CACHE PATH "Install path: SALOME GENERICSOLVER 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_GENERICSOLVER_INSTALL_RES_DATA) + +# Accumulate environment variables for GENERICSOLVER module +SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}) +SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) + +# Sources +# ======== + +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(idl) + +# 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 + SalomeIDLGENERICSOLVER +) + +# 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(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") + +# Build variables that will be expanded when configuring SalomeConfig.cmake: +# SALOME_CONFIGURE_PREPARE() #For use in the future + +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) + +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/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index e69de29..0000000 diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/README b/README deleted file mode 100644 index e69de29..0000000 diff --git a/SalomeGENERICSOLVERConfig.cmake.in b/SalomeGENERICSOLVERConfig.cmake.in new file mode 100644 index 0000000..4a1d722 --- /dev/null +++ b/SalomeGENERICSOLVERConfig.cmake.in @@ -0,0 +1,107 @@ +# - Config file for the @PROJECT_NAME@ package +# It defines the following variables. +# Specific to the package @PROJECT_NAME@ itself: +# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file +# + +############################################################### +# Copyright (C) 2012-2014 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, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# 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 SalomeIDLGENERICSOLVER AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(GENERICSOLVER_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(GENERICSOLVER_INCLUDE_DIRS "${GENERICSOLVER_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") +SET(GENERICSOLVER_INCLUDE_DIRS "${GENERICSOLVER_INCLUDE_DIRS};@_SalomeGENERICSOLVER_EXTRA_HEADERS@") + +# Package specific environment variables +@_SalomeGENERICSOLVER_EXTRA_ENV_FULL@ + +#### Now the specificities + +# Options exported by the package: +SET(SALOME_LIGHT_ONLY @SALOME_LIGHT_ONLY@) + +# Level 1 prerequisites: +SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_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 @_PREREQ_LIST@) +SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@) +SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@") +LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) +IF(NOT _list_len EQUAL 0) + # 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) + LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo) + MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") + IF(NOT _pkg_compo) + FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE + PATHS "${_pkg_dir}" + NO_DEFAULT_PATH) + ELSE() + STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}") + MESSAGE(STATUS "===> (components: ${_pkg_compo})") + FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE + COMPONENTS ${_compo_lst} + PATHS "${_pkg_dir}" + NO_DEFAULT_PATH) + ENDIF() + ENDFOREACH() +ENDIF() + +# Installation directories +SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") +SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") +SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") +SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") +SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") +SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") +SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") +SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") + +# Include KERNEL targets if they were not already loaded: +IF(NOT (TARGET SALOMEBasics)) + INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") +ENDIF() + +# Exposed GENERICSOLVER targets: +SET(GENERICSOLVER_SalomeIDLGENERICSOLVER SalomeIDLGENERICSOLVER) diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am deleted file mode 100644 index 9242a03..0000000 --- a/adm_local/unix/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2009-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am deleted file mode 100644 index 9dc8a20..0000000 --- a/adm_local/unix/config_files/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2009-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_admlocalm4_DATA = \ - check_GENERICSOLVER.m4 diff --git a/adm_local/unix/config_files/check_GENERICSOLVER.m4 b/adm_local/unix/config_files/check_GENERICSOLVER.m4 deleted file mode 100644 index 3993c62..0000000 --- a/adm_local/unix/config_files/check_GENERICSOLVER.m4 +++ /dev/null @@ -1,71 +0,0 @@ -dnl Copyright (C) 2009-2013 EDF R&D -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -# Check availability of GENERICSOLVER binary distribution -# -# Author : Ivan DUTKA-MALEN (EDF 2009) -#------------------------------------------------------------ - -AC_DEFUN([CHECK_GENERICSOLVER],[ - -AC_CHECKING(for GenericSolver) - -GenericSolver_ok=no - -AC_ARG_WITH(generic-solver, - --with-generic-solver=DIR root directory path of GENERICSOLVER installation, - GENERICSOLVER_DIR="$withval",GENERICSOLVER_DIR="") - -if test "x$GENERICSOLVER_DIR" = "x" ; then - -# no --with-generic-solver option used - - if test "x$GENERICSOLVER_ROOT_DIR" != "x" ; then - - # GENERICSOLVER_ROOT_DIR environment variable defined - GENERICSOLVER_DIR=$GENERICSOLVER_ROOT_DIR - - else - - # search Genericsolver binaries in PATH variable - AC_PATH_PROG(TEMP, GENERICSOLVERGUI.py) - if test "x$TEMP" != "x" ; then - GENERICSOLVER_BIN_DIR=`dirname $TEMP` - GENERICSOLVER_DIR=`dirname $GENERICSOLVER_BIN_DIR` - fi - - fi -# -fi - -if test -f ${GENERICSOLVER_DIR}/bin/salome/GENERICSOLVERGUI.py ; then - GenericSolver_ok=yes - AC_MSG_RESULT(Using GENERICSOLVER distribution in ${GENERICSOLVER_DIR}) - - if test "x$GENERICSOLVER_ROOT_DIR" == "x" ; then - GENERICSOLVER_ROOT_DIR=${GENERICSOLVER_DIR} - fi - AC_SUBST(GENERICSOLVER_ROOT_DIR) -else - AC_MSG_WARN("Cannot find compiled GENERICSOLVER distribution") -fi - -AC_MSG_RESULT(for GENERICSOLVER: $GenericSolver_ok) - -])dnl - diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am deleted file mode 100644 index a904426..0000000 --- a/adm_local/unix/make_common_starter.am +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (C) 2009-2013 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/build_configure b/build_configure deleted file mode 100755 index c2a0f9d..0000000 --- a/build_configure +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash -# Copyright (C) 2009-2013 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 -# -# $Id$ -# - -ORIG_DIR=`pwd` -CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` - -######################################################################## -# Test if the KERNEL_ROOT_DIR is set correctly - -if test ! -d "${KERNEL_ROOT_DIR}"; then - echo "failed : KERNEL_ROOT_DIR variable is not correct !" - exit -fi - - -######################################################################## -# Test if the GUI_ROOT_DIR is set correctly - -if test ! -d "${GUI_ROOT_DIR}"; then - echo "failed : GUI_ROOT_DIR variable is not correct !" - exit -fi - -cd ${CONF_DIR} -ABS_CONF_DIR=`pwd` - -mkdir -p salome_adm/unix/config_files -cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix - - -# ____________________________________________________________________ -# aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory salome_adm/unix/config_files -# and KERNEL config_files directory. -# output: -# aclocal.m4 -# autom4te.cache (directory) -echo "====================================================== aclocal" - -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 || 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: -# salome_adm/unix/config_files/compile -# salome_adm/unix/config_files/depcomp -# salome_adm/unix/config_files/install-sh -# salome_adm/unix/config_files/missing -# salome_adm/unix/config_files/py-compile -# Makefile.in (from Makefile.am) -echo "====================================================== automake" - -automake --copy --gnu --add-missing diff --git a/clean_configure b/clean_configure deleted file mode 100755 index d17680c..0000000 --- a/clean_configure +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009-2013 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 -rm -f salome_adm/unix/config_files/* salome_adm/unix/SALOMEconfig.h.in -find . -name "*~" -print -exec rm {} \; -find . -name "*.pyc" -print -exec rm {} \; -find . -name "Makefile.in" -print -exec rm {} \; diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 94322d3..0000000 --- a/configure.ac +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright (C) 2009-2013 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 -# -# $Id$ -# - -AC_PREREQ(2.50) -AC_INIT([Salome GENERICSOLVER module],[7.3.0],[webmaster.salome@opencascade.com],[SalomeGENERICSOLVER]) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) -AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE - -XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` -AC_SUBST(XVERSION) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=genericsolver -AC_SUBST(MODULE_NAME) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -AC_CHECK_PROG(SHELL,sh) -AC_SUBST(SHELL) - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL - -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -AM_PATH_PYTHON(2.3) - -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB - -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo - -DEFAULT_ORB=omniORB -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=adm_local/unix/$corba - -echo -echo --------------------------------------------- -echo testing QT -echo --------------------------------------------- -echo - -CHECK_QT - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -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 GENERICSOLVER module necessary full GUI !" - exit -fi - - - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="python_ok omniORB_ok qt_ok Kernel_ok" - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -echo -echo "Default ORB : $DEFAULT_ORB" -echo - -dnl We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -# 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 helpful to update de configuration. -AC_CONFIG_FILES([ \ - salome_adm/unix/SALOMEconfig.h \ - adm_local/Makefile \ - adm_local/unix/Makefile \ - adm_local/unix/config_files/Makefile \ - src/Makefile \ - src/GENERICSOLVER/Makefile \ - src/GENERICSOLVERGUI/Makefile \ - resources/Makefile \ - resources/GENERICSOLVERCatalog.xml \ - resources/SalomeApp.xml \ - idl/Makefile \ - Makefile \ -]) -AC_OUTPUT diff --git a/Makefile.am b/idl/CMakeLists.txt similarity index 56% rename from Makefile.am rename to idl/CMakeLists.txt index 36a646a..5983ce3 100644 --- a/Makefile.am +++ b/idl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2013 EDF R&D +# Copyright (C) 2009-2014 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 @@ -17,19 +17,26 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +INCLUDE(UseOmniORB) # Provided by KERNEL -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 +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${KERNEL_INCLUDE_DIRS} +) -SUBDIRS = idl adm_local resources src +SET(SalomeIDLGENERICSOLVER_IDLSOURCES + GENERICSOLVER_Gen.idl + DEVIATION_Gen.idl +) -DISTCLEANFILES = a.out aclocal.m4 configure +SET(_idl_include_dirs + ${KERNEL_ROOT_DIR}/idl/salome +) -EXTRA_DIST += \ - build_configure \ - clean_configure +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} +) -dist-hook: - rm -rf `find $(distdir) -name CVS` +OMNIORB_ADD_MODULE(SalomeIDLGENERICSOLVER "${SalomeIDLGENERICSOLVER_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLGENERICSOLVER EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/idl/Makefile.am b/idl/Makefile.am deleted file mode 100644 index e41d19f..0000000 --- a/idl/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (C) 2009-2013 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. -# -# $Id$ -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -BASEIDL_FILES = GENERICSOLVER_Gen.idl DEVIATION_Gen.idl - -# This variable defines the files to be installed -dist_salomeidl_DATA = $(BASEIDL_FILES) - -# 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)/salome_adm/unix -IDLPYFLAGS = \ - @IDLPYFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome - -install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) - $(INSTALL) -d $(DESTDIR)$(salomepythondir) - @for file in $^ dummy; do \ - if [ $$file != "dummy" ]; then \ - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ - fi ; \ - done ; - -# uninstall-local removes too much, but it works in distcheck -uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/* - -mostlyclean-local: - -rm -f *.py - diff --git a/resources/Makefile.am b/resources/CMakeLists.txt similarity index 55% rename from resources/Makefile.am rename to resources/CMakeLists.txt index ef0e652..b1c93cc 100644 --- a/resources/Makefile.am +++ b/resources/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2013 EDF R&D +# Copyright (C) 2009-2014 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 @@ -17,16 +17,18 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +SET(GENERICSOLVER_RESOURCES_FILES + GENERICSOLVERCatalog.xml + icon_variables.png + GENERICSOLVER.png + GENERICSOLVER_small.png + CaseGENERICSOLVER.png + ExecGENERICSOLVER.png + yacsgen_example.py +) -dist_salomeres_DATA = \ - GENERICSOLVER.png \ - GENERICSOLVER_small.png \ - ExecGENERICSOLVER.png \ - CaseGENERICSOLVER.png \ - icon_variables.png \ - $(top_builddir)/resources/SalomeApp.xml \ - yacsgen_example.py +INSTALL(FILES ${GENERICSOLVER_RESOURCES_FILES} DESTINATION ${SALOME_GENERICSOLVER_INSTALL_RES_DATA}) -# VSR: little trick to avoid putting if GENERICSOLVERCatalog.xml to the distribution archive -nodist_salomeres_SCRIPTS = GENERICSOLVERCatalog.xml +MESSAGE(STATUS "Creation of ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml") +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml DESTINATION ${SALOME_GENERICSOLVER_INSTALL_RES_DATA}) diff --git a/resources/GENERICSOLVERCatalog.xml.in b/resources/GENERICSOLVERCatalog.xml similarity index 94% rename from resources/GENERICSOLVERCatalog.xml.in rename to resources/GENERICSOLVERCatalog.xml index 17bee82..a6b60f5 100644 --- a/resources/GENERICSOLVERCatalog.xml.in +++ b/resources/GENERICSOLVERCatalog.xml @@ -43,7 +43,6 @@ GENERICSOLVER GUI Data I. Dutka-Malen - @VERSION@ EDF - RD 1 GENERICSOLVER.png @@ -59,7 +58,6 @@ DEVIATION GUI Data R. Barate - @VERSION@ EDF - RD 1 GENERICSOLVER.png @@ -72,7 +70,6 @@ Init EDF-RD - @VERSION@ 0 @@ -91,7 +88,6 @@ Exec EDF-RD - @VERSION@ 0 @@ -112,7 +108,6 @@ Finalize EDF-RD - @VERSION@ 0 diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 2ab86d5..4ba5252 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -24,7 +24,7 @@ - +
diff --git a/adm_local/Makefile.am b/src/CMakeLists.txt similarity index 87% rename from adm_local/Makefile.am rename to src/CMakeLists.txt index c7a377c..1729d7e 100644 --- a/adm_local/Makefile.am +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2013 EDF R&D +# Copyright (C) 2009-2014 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 @@ -16,6 +16,6 @@ # # 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(GENERICSOLVER) +ADD_SUBDIRECTORY(GENERICSOLVERGUI) diff --git a/src/GENERICSOLVERGUI/Makefile.am b/src/GENERICSOLVER/CMakeLists.txt similarity index 77% rename from src/GENERICSOLVERGUI/Makefile.am rename to src/GENERICSOLVER/CMakeLists.txt index 6a19a89..09f9e4a 100644 --- a/src/GENERICSOLVERGUI/Makefile.am +++ b/src/GENERICSOLVER/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2013 EDF R&D +# Copyright (C) 2009-2014 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 @@ -16,11 +16,14 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# $Id$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + DEVIATION.py + GENERICSOLVER.py +) -# Scripts to be installed -dist_salomescript_SCRIPTS = \ - GENERICSOLVERGUI.py +# --- rules --- +INSTALL_AND_COMPILE_PYTHON_FILE("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON}) diff --git a/src/GENERICSOLVER/Makefile.am b/src/GENERICSOLVER/Makefile.am deleted file mode 100644 index fdbfcd4..0000000 --- a/src/GENERICSOLVER/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2009-2013 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 -# -# $Id$ -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Scripts to be installed -dist_salomescript_SCRIPTS = \ - GENERICSOLVER.py \ - DEVIATION.py diff --git a/src/Makefile.am b/src/GENERICSOLVERGUI/CMakeLists.txt similarity index 81% rename from src/Makefile.am rename to src/GENERICSOLVERGUI/CMakeLists.txt index c8e4b86..da92b9d 100644 --- a/src/Makefile.am +++ b/src/GENERICSOLVERGUI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2013 EDF R&D +# Copyright (C) 2009-2014 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 @@ -17,6 +17,12 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- Python files --- -SUBDIRS = GENERICSOLVER GENERICSOLVERGUI +SET(PYFILES + GENERICSOLVERGUI.py +) + +# --- rules --- + +INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES}" ${SALOME_INSTALL_PYTHON}) -- 2.39.2