From: rnv Date: Fri, 11 Oct 2013 06:54:21 +0000 (+0000) Subject: Porting SIERPINSKY SALOME module to the CMake build system: initial version. X-Git-Tag: V7_3_0a1~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0c664b124f8374aa1c035bec6e92a1bdfa33b3f6;p=samples%2Fsierpinsky.git Porting SIERPINSKY SALOME module to the CMake build system: initial version. --- diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100755 index 0000000..24222e9 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,223 @@ +# 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(SalomeSIERPINSKY 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 "SIERPINSKY module can't be built in Light mode (without CORBA)") +ENDIF() + +# Platform setup +# ============== +INCLUDE(SalomeSetupPlatform) # From KERNEL +# Always build libraries as shared objects: +SET(BUILD_SHARED_LIBS TRUE) +# Local macros: +LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") + +# User options +# (some options have already been defined in KERNEL) +# ============ +#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future +#OPTION(SALOME_BUILD_DOC "Generate SALOME SIERPINSKY documentation" ${SALOME_BUILD_DOC}) For use in the future + +## +## From KERNEL: +## + +# Various +# 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) + +# 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) +# VTK +FIND_PACKAGE(SalomeVTK 6.0) + +# Find RANDOMIZER +# =========== + +SET(RANDOMIZER_ROOT_DIR $ENV{RANDOMIZER_ROOT_DIR} CACHE PATH "Path to the Salome RANDOMIZER") +IF(EXISTS ${RANDOMIZER_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${RANDOMIZER_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeRANDOMIZER REQUIRED) +ELSE(EXISTS ${RANDOMIZER_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome RANDOMIZER, please define RANDOMIZER_ROOT_DIR") +ENDIF(EXISTS ${RANDOMIZER_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}) + +## +## SIERPINSKY specifics +## + +# OCCT +FIND_PACKAGE(SalomeCAS 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") + +# Specific to SIERPINSKY: +SET(SALOME_SIERPINSKY_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/sierpinsky" CACHE PATH + "Install path: SALOME SIERPINSKY 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_SIERPINSKY_INSTALL_RES_DATA) + +# Sources +# ======== + +ADD_SUBDIRECTORY(idl) +ADD_SUBDIRECTORY(adm_local) +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(bin) + +# Header configuration +# ==================== +SALOME_XVERSION(${PROJECT_NAME}) +SALOME_CONFIGURE_FILE(SIERPINSKY_version.h.in SIERPINSKY_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 + SIERPINSKYEngine SIERPINSKY SalomeIDLSIERPINSKY +) + +# 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/Makefile.am b/Makefile.am deleted file mode 100644 index 882c207..0000000 --- a/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2005-2013 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 -# - -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header: -# -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 \ - -I ${VISU_ROOT_DIR}/adm_local/unix/config_files \ - -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files - -SUBDIRS = idl adm_local resources src bin - -DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool - -salomeinclude_DATA = SIERPINSKY_version.h - -EXTRA_DIST += \ - build_configure \ - clean_configure - -dist-hook: - rm -rf `find $(distdir) -name CVS` diff --git a/SIERPINSKY_version.h.in b/SIERPINSKY_version.h.in index 4ab76a4..0f0f755 100644 --- a/SIERPINSKY_version.h.in +++ b/SIERPINSKY_version.h.in @@ -24,12 +24,22 @@ #if !defined(__SIERPINSKY_VERSION_H__) #define __SIERPINSKY_VERSION_H__ -/* - SIERPINSKY_VERSION is (major << 16) + (minor << 8) + patch. +/*! + Specify version of SALOME SIERPINSKY module, as follows + + SIERPINSKY_VERSION_MAJOR : (integer) number identifying major version + SIERPINSKY_VERSION_MINOR : (integer) number identifying minor version + SIERPINSKY_VERSION_MAINTENANCE : (integer) number identifying maintenance version + SIERPINSKY_VERSION_STR : (string) complete version number "major.minor.maintenance" + SIERPINSKY_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + SIERPINSKY_DEVELOPMENT : (integer) indicates development version when set to 1 */ -#define SIERPINSKY_VERSION_STR "@VERSION@" -#define SIERPINSKY_VERSION @XVERSION@ -#define SIERPINSKY_DEVELOPMENT @VERSION_DEV@ +#define SIERPINSKY_VERSION_MAJOR @SALOMESIERPINSKY_MAJOR_VERSION@ +#define SIERPINSKY_VERSION_MINOR @SALOMESIERPINSKY_MINOR_VERSION@ +#define SIERPINSKY_VERSION_MAINTENANCE @SALOMESIERPINSKY_PATCH_VERSION@ +#define SIERPINSKY_VERSION_STR "@SALOMESIERPINSKY_VERSION@" +#define SIERPINSKY_VERSION @SALOMESIERPINSKY_XVERSION@ +#define SIERPINSKY_DEVELOPMENT @SALOMESIERPINSKY_VERSION_DEV@ #endif // __SIERPINSKY_VERSION_H__ diff --git a/SalomeSIERPINSKYConfig.cmake.in b/SalomeSIERPINSKYConfig.cmake.in new file mode 100644 index 0000000..71db8f1 --- /dev/null +++ b/SalomeSIERPINSKYConfig.cmake.in @@ -0,0 +1,100 @@ +# - 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 SIERPINSKYEngine AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(SIERPINSKY_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(SIERPINSKY_INCLUDE_DIRS "${SIERPINSKY_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 SIERPINSKY targets: +SET(SIERPINSKY_SIERPINSKYEngine SIERPINSKYEngine) +SET(SIERPINSKY_SIERPINSKY SIERPINSKY) +SET(SIERPINSKY_SalomeIDLSIERPINSKY SalomeIDLSIERPINSKY) \ No newline at end of file diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt new file mode 100755 index 0000000..84d97c2 --- /dev/null +++ b/adm_local/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(unix) +ADD_SUBDIRECTORY(cmake_files) diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am deleted file mode 100644 index 36ab633..0000000 --- a/adm_local/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2005-2013 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 $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = unix diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt new file mode 100755 index 0000000..c833943 --- /dev/null +++ b/adm_local/cmake_files/CMakeLists.txt @@ -0,0 +1,28 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# =============================================================== +# Files to be installed +# =============================================================== + +# These files are data, module or lib files +SET(_adm_data + FindSalomeSIERPINSKY.cmake +) +INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindSalomeSIERPINSKY.cmake b/adm_local/cmake_files/FindSalomeSIERPINSKY.cmake new file mode 100644 index 0000000..bb4aa48 --- /dev/null +++ b/adm_local/cmake_files/FindSalomeSIERPINSKY.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 SalomeSIERPINSKY_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome SIERPINSKY ...") +ENDIF() + +SET(CMAKE_PREFIX_PATH "${SIERPINSKY_ROOT_DIR}") + +SALOME_FIND_PACKAGE(SalomeSIERPINSKY SalomeSIERPINSKY CONFIG) + +IF(NOT SalomeSIERPINSKY_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome SIERPINSKY: ${SIERPINSKY_ROOT_DIR}") +ENDIF() diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt new file mode 100755 index 0000000..2f895ae --- /dev/null +++ b/adm_local/unix/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(config_files) diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am deleted file mode 100644 index a5f3891..0000000 --- a/adm_local/unix/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2005-2013 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 $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = 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 0000000..f796c6e --- /dev/null +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -0,0 +1,28 @@ +# 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_SIERPINSKY.m4 + check_gd.m4 +) + +INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files) diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am deleted file mode 100644 index b255502..0000000 --- a/adm_local/unix/config_files/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2005-2013 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 $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_admlocalm4_DATA = \ - check_SIERPINSKY.m4 \ - check_gd.m4 diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt new file mode 100755 index 0000000..d220062 --- /dev/null +++ b/bin/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index ab3db4f..0000000 --- a/bin/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2005-2013 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 -# - -# -* Makefile *- -# Author : -# Module : LIGHT -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# non-distributed files -nodist_salomescript_DATA = VERSION - -# distributed files -dist_salomescript_SCRIPTS = diff --git a/bin/VERSION.in b/bin/VERSION.in index 0386bfa..80e48f9 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ -[SALOME SIERPINSKY] : @VERSION@ -[DEVELOPMENT] : @VERSION_DEV@ +[SALOME SIERPINSKY] : @SALOMESIERPINSKY_VERSION@ +[DEVELOPMENT] : @SALOMESIERPINSKY_VERSION_DEV@ [DESCRIPTION] : Sample SALOME module diff --git a/build_configure b/build_configure deleted file mode 100755 index 897ae6c..0000000 --- a/build_configure +++ /dev/null @@ -1,129 +0,0 @@ -#!/bin/bash -# Copyright (C) 2005-2013 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 -# - -# Tool for updating list of .in file for the SALOME project -# and regenerating configure script -# File : build_configure -# Author : Marc Tajchman - CEA -# Created : 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 !" - exit -fi - -######################################################################## -# Test if the GUI_ROOT_DIR is set correctly - -if test ! -d "${GUI_ROOT_DIR}"; then - echo "failed : GUI_ROOT_DIR variable is not correct !" - exit -fi - -######################################################################## -# Test if the SMESH_ROOT_DIR is set correctly - -if test ! -d "${SMESH_ROOT_DIR}"; then - echo "failed : SMESH_ROOT_DIR variable is not correct !" - exit -fi - -######################################################################## -# Test if the RANDOMIZER_ROOT_DIR is set correctly - -if test ! -d "${RANDOMIZER_ROOT_DIR}"; then - echo "failed : RANDOMIZER_ROOT_DIR variable is not correct !" - exit -fi - -cd ${CONF_DIR} -ABS_CONF_DIR=`pwd` - -######################################################################## - -# ____________________________________________________________________ -# aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory adm_local/unix/config_files -# and KERNEL config_files directory. -# output: -# aclocal.m4 -# autom4te.cache (directory) -echo "======================================================= aclocal" - -if test -d "${VISU_ROOT_DIR}"; then - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files \ - -I ${VISU_ROOT_DIR}/adm_local/unix/config_files \ - -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files || exit 1 -else - echo "warning : VISU_ROOT_DIR variable is not correct! SIERPINSKY will be configured without VISU module." - 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 \ - -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files || exit 1 -fi - -# ____________________________________________________________________ -# libtoolize creates some configuration files (ltmain.sh, -# config.guess and config.sub). It only depends on the libtool -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() 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 6488e49..0000000 --- a/clean_configure +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Copyright (C) 2005-2013 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 -# - -rm -rf autom4te.cache aclocal.m4 configure make_config -find . -name "*~" -print -exec rm {} \; -find . -name "*.pyc" -print -exec rm {} \; -find . -name Makefile.in | xargs rm -f -( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile ) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index a76def3..0000000 --- a/configure.ac +++ /dev/null @@ -1,405 +0,0 @@ -# Copyright (C) 2005-2013 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 -# - -# PLEASE DO NOT MODIFY configure.in FILE -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND -# CHANGES MUST BE MADE IN configure.in.base FILE -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# Created from configure.in.base -# -AC_INIT([Salome2 Project SIERPINSKY module],[7.2.0], [webmaster.salome@opencascade.com], [SalomeSIERPINSKY]) -AC_CONFIG_AUX_DIR(adm_local/unix/config_files) -AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([-Wno-portability]) - -XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` -AC_SUBST(XVERSION) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=sierpinsky -AC_SUBST(MODULE_NAME) -VERSION_DEV=0 -AC_SUBST(VERSION_DEV) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -AC_CHECK_PROG(SHELL,sh) -AC_SUBST(SHELL) - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -AC_LOCAL_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! - -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -echo --------------------------------------------- -echo testing libtool -echo --------------------------------------------- - -dnl first, we set static to no! -dnl if we want it, use --enable-static -AC_ENABLE_STATIC(no) - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -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 - -dnl -dnl --------------------------------------------- -dnl testing MPI -dnl --------------------------------------------- -dnl - -dnl CHECK_MPICH -CHECK_MPI - -echo -echo --------------------------------------------- -echo testing LEX \& YACC -echo --------------------------------------------- -echo - -lex_yacc_ok=no -AC_PROG_YACC -AC_PROG_LEX -lex_yacc_ok=yes - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -AM_PATH_PYTHON(2.3) - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing java -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_JAVA - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing mico -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_MICO - -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo - -DEFAULT_ORB=omniORB -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=adm_local/unix/$corba - -echo -echo --------------------------------------------- -echo testing openGL -echo --------------------------------------------- -echo - -CHECK_OPENGL - -echo -echo --------------------------------------------- -echo testing QT -echo --------------------------------------------- -echo - -CHECK_QT - -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo - -CHECK_VTK - -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 html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo Testing gd library -echo --------------------------------------------- -echo - -CHECK_GDLIB - -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 COMPONENT module necessary full GUI !" - exit -fi - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing SMESH -echo --------------------------------------------- -echo - -CHECK_SMESH - -echo -echo --------------------------------------------- -echo Testing Visu -echo --------------------------------------------- -echo - -CHECK_VISU - -AM_CONDITIONAL(WITH_VISU, [test "${Visu_ok}" = "yes"]) - -echo -echo --------------------------------------------- -echo Testing Randomizer -echo --------------------------------------------- -echo - -CHECK_RANDOMIZER - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok -OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok gd_ok Kernel_ok SMesh_ok Visu_ok Randomizer_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 - -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/*; \ -]) - -AC_HACK_LIBTOOL -AC_CONFIG_COMMANDS([hack_libtool],[ -sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ - $(pwd)/hack_libtool \1 \"\$[@]\" \n\ -}\n\ -CC=\"hack_libtool\"%g" libtool -sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool -sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool -sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool -],[]) - -# This list is initiated using autoscan and must be updated manually -# when adding a new file .in to manage. When you execute -# autoscan, the Makefile list is generated in the output file configure.scan. -# This could be helpfull to update de configuration. -AC_OUTPUT([ \ - adm_local/Makefile \ - adm_local/unix/Makefile \ - adm_local/unix/config_files/Makefile \ - bin/VERSION \ - bin/Makefile \ - src/Makefile \ - src/Sierpinsky/Makefile \ - src/SierpinskyGUI/Makefile \ - resources/Makefile \ - resources/SIERPINSKYCatalog.xml \ - resources/SalomeApp.xml \ - idl/Makefile \ - SIERPINSKY_version.h \ - Makefile \ -]) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt new file mode 100755 index 0000000..1b47dd2 --- /dev/null +++ b/idl/CMakeLists.txt @@ -0,0 +1,41 @@ +# 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(SalomeIDLSIERPINSKY_IDLSOURCES + Sierpinsky.idl +) + +SET(_idl_include_dirs + ${KERNEL_ROOT_DIR}/idl/salome +) + +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} +) + +OMNIORB_ADD_MODULE(SalomeIDLSIERPINSKY "${SalomeIDLSIERPINSKY_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLSIERPINSKY EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/idl/Makefile.am b/idl/Makefile.am deleted file mode 100644 index 58ada11..0000000 --- a/idl/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (C) 2005-2013 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 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 = Sierpinsky.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 = libSalomeIDLSIERPINSKY.la - -# Sources built from idl files -nodist_libSalomeIDLSIERPINSKY_la_SOURCES = \ - SierpinskySK.cc \ - SierpinskyDynSK.cc -SierpinskyDynSK.cc: SierpinskySK.cc - -# header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) - -libSalomeIDLSIERPINSKY_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ \ - @CORBA_INCLUDES@ - -libSalomeIDLSIERPINSKY_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLSIERPINSKY_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 -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 SIERPINSKY_ORB ; 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 0000000..6d7be42 --- /dev/null +++ b/resources/CMakeLists.txt @@ -0,0 +1,33 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(SIERPINSKY_RESOURCES_FILES + SIERPINSKY.png + go.png + schema1.xml + schema2.xml +) + +INSTALL(FILES ${SIERPINSKY_RESOURCES_FILES} DESTINATION ${SALOME_SIERPINSKY_INSTALL_RES_DATA}) + +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SIERPINSKY_INSTALL_RES_DATA}) +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SIERPINSKYCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SIERPINSKYCatalog.xml INSTALL ${SALOME_SIERPINSKY_INSTALL_RES_DATA}) \ No newline at end of file diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index 6f0d6b0..0000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2005-2013 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 -# - -# -* Makefile *- -# Author : -# Date : 28/06/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomeres_DATA = \ - SIERPINSKY.png \ - go.png \ - schema1.xml \ - schema2.xml - -# VSR: little trick to avoid putting if SIERPINSKYCatalog.xml to the distribution archive -nodist_salomeres_SCRIPTS = SIERPINSKYCatalog.xml SalomeApp.xml diff --git a/resources/SIERPINSKYCatalog.xml.in b/resources/SIERPINSKYCatalog.xml.in index e1feb0a..8530f90 100644 --- a/resources/SIERPINSKYCatalog.xml.in +++ b/resources/SIERPINSKYCatalog.xml.in @@ -28,7 +28,7 @@ Sierpinsky OTHER Vadim SANDLER (VSR) - @VERSION@ + @SALOMESIERPINSKY_VERSION@ unknown 0 SIERPINSKY.png diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index df50ae3..0f8f6eb 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -23,7 +23,7 @@ - +
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100755 index 0000000..b7a56ac --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,34 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +## +# Common packages +## +SET(SUBDIRS_COMMON + Sierpinsky SierpinskyGUI +) + +SET(SUBDIRS + ${SUBDIRS_COMMON} +) + +FOREACH(dir ${SUBDIRS}) + ADD_SUBDIRECTORY(${dir}) +ENDFOREACH(dir ${SUBDIRS}) + diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100755 index 6bc0eac..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2005-2013 OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SIERPINSKY -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = Sierpinsky SierpinskyGUI diff --git a/src/Sierpinsky/CMakeLists.txt b/src/Sierpinsky/CMakeLists.txt new file mode 100644 index 0000000..40f1788 --- /dev/null +++ b/src/Sierpinsky/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( + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${SMESH_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${BOOST_DEFINITIONS} + ${HDF5_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_gd} + ${KERNEL_SalomeIDLKernel} + ${SMESH_MEDWrapper} + ${CORBA_LIBS} + SalomeIDLSIERPINSKY + gd +) + +# --- headers --- + +# header files / no moc processing +SET(SIERPINSKYEngine_HEADERS + SIERPINSKY_Gen_i.hxx +) + +# --- sources --- + +# sources / static +SET(SIERPINSKYEngine_SOURCES + SIERPINSKY_Gen_i.cxx +) + +# --- rules --- + +ADD_LIBRARY(SIERPINSKYEngine ${SIERPINSKYEngine_SOURCES}) +TARGET_LINK_LIBRARIES(SIERPINSKYEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS SIERPINSKYEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SIERPINSKYEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/Sierpinsky/Makefile.am b/src/Sierpinsky/Makefile.am deleted file mode 100644 index 158cac4..0000000 --- a/src/Sierpinsky/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2005-2013 OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -############################################################### -# File : Makefile.in -# Author : Vadim SANDLER (OCN) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Created : 13/07/05 -############################################################### -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = SIERPINSKY_Gen_i.hxx - -# Libraries targets -lib_LTLIBRARIES = libSIERPINSKYEngine.la - -dist_libSIERPINSKYEngine_la_SOURCES = \ - SIERPINSKY_Gen_i.cxx - -libSIERPINSKYEngine_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(SMESH_CXXFLAGS) \ - $(HDF5_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libSIERPINSKYEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLSIERPINSKY.la \ - $(CORBA_LIBS) \ - $(KERNEL_LDFLAGS) \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSALOMELocalTrace \ - -lgd \ - -lSalomeIDLKernel \ - $(SMESH_LDFLAGS) \ - -lMEDWrapper diff --git a/src/SierpinskyGUI/CMakeLists.txt b/src/SierpinskyGUI/CMakeLists.txt new file mode 100644 index 0000000..60cc0d2 --- /dev/null +++ b/src/SierpinskyGUI/CMakeLists.txt @@ -0,0 +1,95 @@ +# 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) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDES} + ${KERNEL_INCLUDE_DIRS} + ${SMESH_INCLUDE_DIRS} + ${RANDOMIZER_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_SOURCE_DIR}/src/Sierpinsky +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${BOOST_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${CAS_DEFINITIONS} + ${KERNEL_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${QT_LIBS} + ${KERNEL_SalomeLifeCycleCORBA} + ${GUI_SalomeApp} + ${RANDOMIZER_SalomeIDLRANDOMIZER} + SIERPINSKYEngine +) + +# --- headers --- + +# header files / to be processed by moc +SET(SIERPINSKY_HEADERS + SierpinskyGUI_RunDlg.h + SierpinskyGUI.h +) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${SIERPINSKY_HEADERS}) + +# sources / static +SET(_other_SOURCES + SierpinskyGUI.cxx + SierpinskyGUI_RunDlg.cxx +) + +# sources / to compile +SET(SIERPINSKY_SOURCES ${_other_SOURCES} ${_moc_SOURCES}) + +# --- resources --- + +# resource files / to be processed by lrelease +SET(_ts_RESOURCES + SIERPINSKY_icons.ts + SIERPINSKY_msg_en.ts + SIERPINSKY_msg_fr.ts +) + +# --- rules --- + +ADD_LIBRARY(SIERPINSKY ${SIERPINSKY_SOURCES}) +TARGET_LINK_LIBRARIES(SIERPINSKY ${_link_LIBRARIES} ) +INSTALL(TARGETS SIERPINSKY EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SIERPINSKY_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SIERPINSKY_INSTALL_RES_DATA}") diff --git a/src/SierpinskyGUI/Makefile.am b/src/SierpinskyGUI/Makefile.am deleted file mode 100644 index 0758b9b..0000000 --- a/src/SierpinskyGUI/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (C) 2005-2013 OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -############################################################### -# File : Makefile.in -# Author : Vadim SANDLER (OCN) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Created : 13/07/05 -############################################################### -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = - SierpinskyGUI.h \ - SierpinskyGUI_RunDlg.h - -nodist_salomeres_DATA= \ - SIERPINSKY_icons.qm \ - SIERPINSKY_msg_en.qm \ - SIERPINSKY_msg_fr.qm - -# Libraries targets -lib_LTLIBRARIES = libSIERPINSKY.la - -dist_libSIERPINSKY_la_SOURCES = \ - SierpinskyGUI.cxx \ - SierpinskyGUI_RunDlg.cxx - -# MOC pre-processing -MOC_FILES = \ - SierpinskyGUI_RunDlg_moc.cxx \ - SierpinskyGUI_moc.cxx - -nodist_libSIERPINSKY_la_SOURCES = $(MOC_FILES) - -libSIERPINSKY_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(SMESH_CXXFLAGS) \ - $(RANDOMIZER_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../Sierpinsky \ - -I$(top_builddir) \ - -I$(top_builddir)/idl - -if WITH_VISU - libSIERPINSKY_la_CPPFLAGS += $(VISU_CXXFLAGS) -DWITH_VISU -endif - -libSIERPINSKY_la_LDFLAGS = \ - ../Sierpinsky/libSIERPINSKYEngine.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeLifeCycleCORBA \ - $(GUI_LDFLAGS) \ - -lSalomeApp \ - $(RANDOMIZER_LDFLAGS) \ - -lSalomeIDLRANDOMIZER \ - $(QT_LIBS) - -if WITH_VISU - libSIERPINSKY_la_LDFLAGS += $(VISU_LDFLAGS) -lSalomeIDLVISU -endif - -