From: rnv Date: Thu, 19 Sep 2013 09:41:48 +0000 (+0000) Subject: Porting ATOMIC module to the CMake build system: initial version. X-Git-Tag: V7_3_0a1~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4933390669e4afcb6f082faf61c0f97497db866f;p=samples%2Fatomic.git Porting ATOMIC module to the CMake build system: initial version. --- diff --git a/ATOMIC_version.h.in b/ATOMIC_version.h.in index 9bc83db..55228be 100644 --- a/ATOMIC_version.h.in +++ b/ATOMIC_version.h.in @@ -20,12 +20,24 @@ #if !defined(__ATOMIC_VERSION_H__) #define __ATOMIC_VERSION_H__ -/* - ATOMIC_VERSION is (major << 16) + (minor << 8) + patch. + +/*! + Specify version of SALOME ATOMIC module, as follows + + ATOMIC_VERSION_MAJOR : (integer) number identifying major version + ATOMIC_VERSION_MINOR : (integer) number identifying minor version + ATOMIC_VERSION_MAINTENANCE : (integer) number identifying maintenance version + ATOMIC_VERSION_STR : (string) complete version number "major.minor.maintenance" + ATOMIC_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + ATOMIC_DEVELOPMENT : (integer) indicates development version when set to 1 */ -#define ATOMIC_VERSION_STR "@VERSION@" -#define ATOMIC_VERSION @XVERSION@ -#define ATOMIC_DEVELOPMENT @VERSION_DEV@ +#define ATOMIC_VERSION_MAJOR @SALOMEATOMIC_MAJOR_VERSION@ +#define ATOMIC_VERSION_MINOR @SALOMEATOMIC_MINOR_VERSION@ +#define ATOMIC_VERSION_MAINTENANCE @SALOMEATOMIC_PATCH_VERSION@ +#define ATOMIC_VERSION_STR "@SALOMEATOMIC_VERSION@" +#define ATOMIC_VERSION @SALOMEATOMIC_XVERSION@ +#define ATOMIC_DEVELOPMENT @SALOMEATOMIC_VERSION_DEV@ + #endif // __ATOMIC_VERSION_H__ diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..70ce09c --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,177 @@ +# 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(SalomeATOMIC C CXX) + +# Ensure a proper linker behavior: +CMAKE_POLICY(SET CMP0003 NEW) + +# Versioning +# =========== +# Project name, upper case +STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) + +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_VERSION + ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) + +# Find KERNEL +# =========== +SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") +IF(EXISTS ${KERNEL_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") + INCLUDE(SalomeMacros) + FIND_PACKAGE(SalomeKERNEL REQUIRED) +ELSE(EXISTS ${KERNEL_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") +ENDIF(EXISTS ${KERNEL_ROOT_DIR}) + +# Platform setup +# ============== +INCLUDE(SalomeSetupPlatform) # From KERNEL +# Always build libraries as shared objects: +SET(BUILD_SHARED_LIBS TRUE) +# Local macros: +LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") + +# User options +# (some options have already been defined in KERNEL) +# ============ +# OPTION(SALOME_BUILD_DOC "Generate SALOME ATOMGEN documentation" ${SALOME_BUILD_DOC}) For use in the fiature +# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the fiature + +# 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}) + +## +## ATOMIC specifics +## + +FIND_PACKAGE(SalomePython REQUIRED) +FIND_PACKAGE(SalomeCAS REQUIRED) +FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt4 +FIND_PACKAGE(SalomePyQt4 REQUIRED) +# Qt4 +FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) +INCLUDE(${QT_USE_FILE}) + +# Directories +# (default values taken from KERNEL) +# =========== +SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries") +SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "Install path: SALOME headers") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH + "Install path: SALOME scripts") +SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH + "Install path: SALOME script data") +SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH + "Install path: SALOME Python scripts") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH + "Install path: SALOME application skeleton - scripts") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH + "Install path: SALOME application skeleton - Python") +SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff") +SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH + "Install path: SALOME Python shared modules") +SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH + "Install path: local SALOME CMake files") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH + "Install path: local SALOME config files (obsolete, to be removed)") +SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") +SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") + +# Atomic specific: +SET(SALOME_ATOMIC_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/atomic" CACHE PATH "Install path: SALOME ATOMIC specific data") + +MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS 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_ATOMIC_INSTALL_RES_DATA) + +# Sources +# ======== + +ADD_SUBDIRECTORY(adm_local) +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(bin) + +# Header configuration +# ==================== +SALOME_XVERSION(${PROJECT_NAME}) +SALOME_CONFIGURE_FILE(ATOMIC_version.h.in ATOMIC_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 + ATOMIC AtomicPy +) + +# 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(SIP_ROOT_DIR "${SIP_ROOT_DIR}") +SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}") +SET(QT4_ROOT_DIR "${QT4_ROOT_DIR}") +SET(CAS_ROOT_DIR "${CAS_ROOT_DIR}") +SET(PYQT4_ROOT_DIR "${PYQT4_ROOT_DIR}") + +SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") +CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${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 + KERNEL_ROOT_DIR GUI_ROOT_DIR SIP_ROOT_DIR QT4_ROOT_DIR PYQT4_ROOT_DIR CAS_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 100755 index 046226d..0000000 --- a/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files - -SUBDIRS = adm_local resources src bin - -DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh - -salomeinclude_DATA = ATOMIC_version.h - -EXTRA_DIST += \ - build_configure \ - clean_configure \ - LICENCE - -dist-hook: - rm -rf `find $(distdir) -name CVS` 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 a8acbbd..0000000 --- a/adm_local/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -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..c3506a6 --- /dev/null +++ b/adm_local/cmake_files/CMakeLists.txt @@ -0,0 +1,29 @@ +# 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 + FindSalomeATOMIC.cmake + FindATOMIC.cmake +) +INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindATOMIC.cmake b/adm_local/cmake_files/FindATOMIC.cmake new file mode 100644 index 0000000..2a0d14d --- /dev/null +++ b/adm_local/cmake_files/FindATOMIC.cmake @@ -0,0 +1,24 @@ +# 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 +# + + +SET(ATOMIC_CXXFLAGS -I${ATOMIC_ROOT_DIR}/include/salome) + +FIND_LIBRARY(ATOMIC ATOMIC ${ATOMIC_ROOT_DIR}/lib/salome) +FIND_LIBRARY(AtomicPy AtomicPy ${ATOMIC_ROOT_DIR}/lib/salome) \ No newline at end of file diff --git a/adm_local/cmake_files/FindSalomeATOMIC.cmake b/adm_local/cmake_files/FindSalomeATOMIC.cmake new file mode 100644 index 0000000..a9c6ff8 --- /dev/null +++ b/adm_local/cmake_files/FindSalomeATOMIC.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 SalomeATOMIC_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome ATOMIC ...") +ENDIF() + +SET(CMAKE_PREFIX_PATH "${ATOMIC_ROOT_DIR}") + +SALOME_FIND_PACKAGE(SalomeATOMIC SalomeATOMIC CONFIG) + +IF(NOT SalomeATOMIC_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome ATOMIC: ${ATOMIC_ROOT_DIR}") +ENDIF() diff --git a/adm_local/cmake_files/SalomeATOMICConfig.cmake.in b/adm_local/cmake_files/SalomeATOMICConfig.cmake.in new file mode 100644 index 0000000..755c812 --- /dev/null +++ b/adm_local/cmake_files/SalomeATOMICConfig.cmake.in @@ -0,0 +1,104 @@ +# - 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 Event AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(ATOMIC_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(ATOMIC_INCLUDE_DIRS "${ATOMIC_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") + +#### Now the specificities + +# Options exported by the package: +SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@) +SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_LIGHT_ONLY @SALOME_LIGHT_ONLY@) + +# Level 1 prerequisites: +SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") +SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") +SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@") +SET_AND_CHECK(SIP_ROOT_DIR_EXP "@PACKAGE_SIP_ROOT_DIR@") +SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT4_ROOT_DIR@") +SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT4_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 CAS PyQt4 Qt4 SIP) +SET(_PREREQ_CONFIG_DIR "@CAS_DIR@" "@PyQt4_DIR@" "@Qt4_DIR@" "@SIP_DIR@") +LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) +# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... +MATH(EXPR _range "${_list_len}-1") +FOREACH(_p RANGE ${_range}) + LIST(GET _PREREQ ${_p} _pkg ) + LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir) + IF(_pkg_dir) + MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") + FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE + PATHS "${_pkg_dir}" + NO_DEFAULT_PATH) + ENDIF() +ENDFOREACH() + +# Installation directories +SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") +SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") +SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") +SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") +SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") +SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") +SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") +SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") + +# Include KERNEL targets if they were not already loaded: +IF(NOT (TARGET SALOMEBasics)) + INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") +ENDIF() + +# Exposed ATOMIC targets: +SET(ATOMIC_ATOMIC ATOMIC) +SET(ATOMIC_AtomicPy AtomicPy) \ No newline at end of file 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 c68bae1..0000000 --- a/adm_local/unix/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -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..65438a4 --- /dev/null +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -0,0 +1,27 @@ +# 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_ATOMIC.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 0d24226..0000000 --- a/adm_local/unix/config_files/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_admlocalm4_DATA = check_ATOMIC.m4 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am deleted file mode 100644 index 3954a9a..0000000 --- a/adm_local/unix/make_common_starter.am +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# ============================================================ -# The following is to avoid PACKAGE_... env variable -# redefinition compilation warnings -# ============================================================ -AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h - -# ============================================================ -# This file defines the common definitions used in several -# Makefile. This file must be included, if needed, by the file -# Makefile.am. -# ============================================================ -# Standard directory for installation -# -salomeincludedir = $(includedir)/salome -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome -bindir = $(prefix)/bin/salome -salomescriptdir = $(bindir) -salomepythondir = $(pythondir)/salome -salomepyexecdir = $(pyexecdir)/salome - -# Directory for installing 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: resources/%.ts - $(LRELEASE) $< -qm $@ - -# resource files generation (qrcc) -qrc_%.cxx: %.qrc - $(QRCC) $< -o $@ -name $(*F) - -# qt forms files generation (uic) -ui_%.h: %.ui - $(UIC) -o $@ $< - -# extra distributed files -EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=resources/%.ts) - -# customize clean operation -mostlyclean-local: - rm -f @builddir@/*_moc.cxx - rm -f @builddir@/*.qm - rm -f @builddir@/ui_*.h - rm -f @builddir@/qrc_*.cxx - -# tests -tests: unittest - -unittest: $(UNIT_TEST_PROG) - @if test "x$(UNIT_TEST_PROG)" != "x"; then \ - $(UNIT_TEST_PROG); \ - fi; diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt new file mode 100755 index 0000000..46b7fce --- /dev/null +++ b/bin/CMakeLists.txt @@ -0,0 +1,22 @@ +# 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 +# + +CONFIGURE_FILE(VERSION.in VERSION @ONLY) + +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION ${SALOME_INSTALL_BINS}) \ No newline at end of file diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index eddc548..0000000 --- a/bin/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -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 0b25057..90f1699 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ -[SALOME ATOMIC] : @VERSION@ -[DEVELOPMENT] : @VERSION_DEV@ +[SALOME ATOMIC] : @SALOMEATOMIC_VERSION@ +[DEVELOPMENT] : @SALOMEATOMIC_VERSION_DEV@ [DESCRIPTION] : This is sample of "light" (w/o CORBA engine) SALOME module (part of SALOME tutorial) diff --git a/build_configure b/build_configure deleted file mode 100755 index 9633c7e..0000000 --- a/build_configure +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash - -# 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 -# - -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` - -# ____________________________________________________________________ -# aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory adm_local/unix/config_files -# and KERNEL config_files directory. -# output: -# aclocal.m4 -# autom4te.cache (directory) -echo "======================================================= aclocal" - -aclocal -I adm_local/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 - -# ____________________________________________________________________ -# libtoolize creates some configuration files (ltmain.sh, -# config.guess and config.sub). It only depends on the libtool -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). -# output: -# adm_local/unix/config_files/config.guess -# adm_local/unix/config_files/config.sub -# adm_local/unix/config_files/ltmain.sh -echo "==================================================== libtoolize" - -libtoolize --force --copy --automake || exit 1 - -# ____________________________________________________________________ -# autoconf creates the configure script from the file configure.ac (or -# configure.in if configure.ac doesn't exist) -# output: -# configure -echo "====================================================== autoconf" - -autoconf - -# ____________________________________________________________________ -# automake creates some scripts used in building process -# (install-sh, missing, ...). It only depends on the automake -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also -# creates the Makefile.in files from the Makefile.am files. -# output: -# adm_local/unix/config_files/compile -# adm_local/unix/config_files/depcomp -# adm_local/unix/config_files/install-sh -# adm_local/unix/config_files/missing -# adm_local/unix/config_files/py-compile -# Makefile.in (from Makefile.am) -echo "====================================================== automake" - -automake --copy --gnu --add-missing diff --git a/clean_configure b/clean_configure deleted file mode 100755 index 134e1cd..0000000 --- a/clean_configure +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# 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 -# - -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 100755 index 5643644..0000000 --- a/configure.ac +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -AC_INIT([Salome2 Project ATOMIC module], [7.2.0], [webmaster.salome@opencascade.com], [SalomeATOMIC]) -AC_CONFIG_AUX_DIR(adm_local/unix/config_files) -AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([-Wno-portability]) - -XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` -AC_SUBST(XVERSION) -VERSION_DEV=0 -AC_SUBST(VERSION_DEV) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=atomic -AC_SUBST(MODULE_NAME) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -AC_CHECK_PROG(SHELL,sh) -AC_SUBST(SHELL) - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -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 - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_CXX_WARNINGS -AC_CXX_TEMPLATE_OPTIONS -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -dnl Library librt : for alpha/osf -AC_CHECK_LIB(rt,nanosleep) - -dnl -dnl Check if we use std iostream by default or if we must add -dnl a compiler directive for that -dnl - -AC_CXX_USE_STD_IOSTREAM - -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 linker -dnl --------------------------------------------- -dnl - -AC_LINKER_OPTIONS - -dnl -dnl --------------------------------------------- -dnl testing WITHIHM -dnl --------------------------------------------- -dnl - -CHECK_WITHIHM - -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) - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -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 MPI -echo --------------------------------------------- -echo - -CHECK_MPI - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing sip -echo --------------------------------------------- -echo - -CHECK_SIP - - -echo -echo --------------------------------------------- -echo Testing pyqt -echo --------------------------------------------- -echo - -CHECK_PYQT - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_SALOME_GUI - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="cc_ok lex_yacc_ok python_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok" - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -dnl We don't need to say when we re entering directories if we re using -dnl GNU make because make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/* \ -]) - -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 helpfull to update de configuration. -AC_OUTPUT([ \ - adm_local/Makefile \ - adm_local/unix/Makefile \ - adm_local/unix/config_files/Makefile \ - bin/VERSION \ - bin/Makefile \ - resources/Makefile \ - resources/SalomeApp.xml \ - src/Makefile \ - src/ATOMICGUI/Makefile \ - src/AtomicPy/Makefile \ - ATOMIC_version.h \ - Makefile \ -]) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt new file mode 100755 index 0000000..14d6d6e --- /dev/null +++ b/resources/CMakeLists.txt @@ -0,0 +1,37 @@ +# 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(ATOMIC_RESOURCES_FILES + atom_conf.png + atom_remove.png + atom_rename.png + atom.png + ATOMIC.png + LightApp.xml + sample.xml +) + +INSTALL(FILES ${ATOMIC_RESOURCES_FILES} DESTINATION ${SALOME_ATOMIC_INSTALL_RES_DATA}) + +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_ATOMIC_INSTALL_RES_DATA}) \ No newline at end of file diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index 3b5f2ac..0000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomeres_DATA = \ - ATOMIC.png \ - atom.png \ - atom_conf.png \ - atom_remove.png \ - atom_rename.png \ - LightApp.xml \ - sample.xml -nodist_salomeres_SCRIPTS = SalomeApp.xml \ No newline at end of file diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index abe9f74..3a685bf 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -26,7 +26,7 @@
- +
diff --git a/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx index eca4988..353886c 100644 --- a/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx +++ b/src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include +#include "ATOMICGUI_AddAtomDlg.h" #include #include #include diff --git a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx index b625ad2..1d4454d 100644 --- a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx +++ b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include -#include -#include +#include "ATOMICGUI_AddAtomOp.h" +#include "ATOMICGUI_AddAtomDlg.h" +#include "ATOMICGUI_DataModel.h" +#include "ATOMICGUI.h" #include #include diff --git a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h index 94fe521..a1c3edf 100644 --- a/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h +++ b/src/ATOMICGUI/ATOMICGUI_AddAtomOp.h @@ -20,7 +20,7 @@ #ifndef ATOMICGUI_ADD_ATOM_OP_H #define ATOMICGUI_ADD_ATOM_OP_H -#include +#include "ATOMICGUI_Operation.h" class ATOMICGUI_AddAtomDlg; diff --git a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx index eabd88c..e51ebb3 100644 --- a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx +++ b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx @@ -17,8 +17,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include +#include "ATOMICGUI_CreateMolOp.h" +#include "ATOMICGUI_DataModel.h" /*! Constructor */ ATOMICGUI_CreateMolOp::ATOMICGUI_CreateMolOp() diff --git a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h index 239687b..32bb4ed 100644 --- a/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h +++ b/src/ATOMICGUI/ATOMICGUI_CreateMolOp.h @@ -20,7 +20,7 @@ #ifndef ATOMICGUI_CREATECONF_OP_H #define ATOMICGUI_CREATECONF_OP_H -#include +#include "ATOMICGUI_Operation.h" /*! * Class : ATOMICGUI_AddAtomOp diff --git a/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx b/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx index 8c65f21..dc62016 100644 --- a/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx +++ b/src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx @@ -17,9 +17,9 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include -#include +#include "ATOMICGUI_DeleteOp.h" +#include "ATOMICGUI_DataModel.h" +#include "ATOMICGUI.h" /*! Constructor */ ATOMICGUI_DeleteOp::ATOMICGUI_DeleteOp() diff --git a/src/ATOMICGUI/ATOMICGUI_DeleteOp.h b/src/ATOMICGUI/ATOMICGUI_DeleteOp.h index cda5017..7b82f6d 100644 --- a/src/ATOMICGUI/ATOMICGUI_DeleteOp.h +++ b/src/ATOMICGUI/ATOMICGUI_DeleteOp.h @@ -20,7 +20,7 @@ #ifndef ATOMICGUI_DELETEOP_OP_H #define ATOMICGUI_DELETEOP_OP_H -#include +#include "ATOMICGUI_Operation.h" /*! * Class : ATOMICGUI_DeleteOp diff --git a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx index 074d029..15a63cd 100644 --- a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx +++ b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx @@ -17,8 +17,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include +#include "ATOMICGUI_ImportExportOp.h" +#include "ATOMICGUI_DataModel.h" #include #include diff --git a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h index 24d53d5..12b9aac 100644 --- a/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h +++ b/src/ATOMICGUI/ATOMICGUI_ImportExportOp.h @@ -20,7 +20,7 @@ #ifndef ATOMICGUI_IMPORTEXPORT_OP_H #define ATOMICGUI_IMPORTEXPORT_OP_H -#include +#include "ATOMICGUI_Operation.h" /*! * Class : ATOMICGUI_ImportExportOp diff --git a/src/ATOMICGUI/ATOMICGUI_Operation.cxx b/src/ATOMICGUI/ATOMICGUI_Operation.cxx index 67d2166..dd155be 100644 --- a/src/ATOMICGUI/ATOMICGUI_Operation.cxx +++ b/src/ATOMICGUI/ATOMICGUI_Operation.cxx @@ -17,9 +17,9 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include -#include +#include "ATOMICGUI_Operation.h" +#include "ATOMICGUI_DataModel.h" +#include "ATOMICGUI.h" #include #include diff --git a/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx b/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx index 73b14dc..823863e 100644 --- a/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx +++ b/src/ATOMICGUI/ATOMICGUI_RenameOp.cxx @@ -17,10 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include -#include -#include -#include +#include "ATOMICGUI_RenameOp.h" +#include "ATOMICGUI_DataModel.h" +#include "ATOMICGUI_DataObject.h" +#include "ATOMICGUI.h" #include #include diff --git a/src/ATOMICGUI/ATOMICGUI_RenameOp.h b/src/ATOMICGUI/ATOMICGUI_RenameOp.h index 93c6dc4..c960de9 100644 --- a/src/ATOMICGUI/ATOMICGUI_RenameOp.h +++ b/src/ATOMICGUI/ATOMICGUI_RenameOp.h @@ -20,7 +20,7 @@ #ifndef ATOMICGUI_RENAME_OP_H #define ATOMICGUI_RENAME_OP_H -#include +#include "ATOMICGUI_Operation.h" /*! * Class : ATOMICGUI_DeleteOp diff --git a/src/ATOMICGUI/CMakeLists.txt b/src/ATOMICGUI/CMakeLists.txt new file mode 100644 index 0000000..22c061c --- /dev/null +++ b/src/ATOMICGUI/CMakeLists.txt @@ -0,0 +1,107 @@ +# 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} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${QT_DEFINITIONS} + ${CAS_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${QT_LIBRARIES} + ${GUI_LightApp} +) + +# --- headers --- + +# header files / to be processed by moc +SET(_moc_HEADERS + ATOMICGUI.h + ATOMICGUI_DataModel.h + ATOMICGUI_AddAtomDlg.h + ATOMICGUI_Operation.h + ATOMICGUI_CreateMolOp.h + ATOMICGUI_DeleteOp.h + ATOMICGUI_RenameOp.h + ATOMICGUI_ImportExportOp.h + ATOMICGUI_AddAtomOp.h +) + +# header files / no moc processing +SET(_other_HEADERS + ATOMICGUI_Data.h + ATOMICGUI_DataObject.h + ATOMICGUI_Selection.h +) + +# header files / to install +SET(ATOMICGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +# sources / static +SET(_other_SOURCES + ATOMICGUI.cxx + ATOMICGUI_Data.cxx + ATOMICGUI_DataObject.cxx + ATOMICGUI_DataModel.cxx + ATOMICGUI_AddAtomDlg.cxx + ATOMICGUI_Selection.cxx + ATOMICGUI_Operation.cxx + ATOMICGUI_AddAtomOp.cxx + ATOMICGUI_CreateMolOp.cxx + ATOMICGUI_RenameOp.cxx + ATOMICGUI_DeleteOp.cxx + ATOMICGUI_ImportExportOp.cxx +) + +# sources / to compile +SET(ATOMICGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES}) + +# --- resources --- + +# resource files / to be processed by lrelease +SET(_ts_RESOURCES + resources/ATOMIC_images.ts + resources/ATOMIC_msg_en.ts +) + +# --- rules --- + +ADD_LIBRARY(ATOMIC ${ATOMICGUI_SOURCES}) +TARGET_LINK_LIBRARIES(ATOMIC ${_link_LIBRARIES} ) +INSTALL(TARGETS ATOMIC EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${ATOMICGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_ATOMIC_INSTALL_RES_DATA}") diff --git a/src/ATOMICGUI/Makefile.am b/src/ATOMICGUI/Makefile.am deleted file mode 100644 index d0e9d8a..0000000 --- a/src/ATOMICGUI/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Library target -lib_LTLIBRARIES = libATOMIC.la - -# Library sources -dist_libATOMIC_la_SOURCES = \ - ATOMICGUI.h \ - ATOMICGUI.cxx \ - ATOMICGUI_Data.h \ - ATOMICGUI_Data.cxx \ - ATOMICGUI_DataObject.h \ - ATOMICGUI_DataObject.cxx \ - ATOMICGUI_DataModel.h \ - ATOMICGUI_DataModel.cxx \ - ATOMICGUI_AddAtomDlg.h \ - ATOMICGUI_AddAtomDlg.cxx \ - ATOMICGUI_Selection.h \ - ATOMICGUI_Selection.cxx \ - ATOMICGUI_Operation.h \ - ATOMICGUI_Operation.cxx \ - ATOMICGUI_AddAtomOp.h \ - ATOMICGUI_AddAtomOp.cxx \ - ATOMICGUI_CreateMolOp.h \ - ATOMICGUI_CreateMolOp.cxx \ - ATOMICGUI_RenameOp.h \ - ATOMICGUI_RenameOp.cxx \ - ATOMICGUI_DeleteOp.h \ - ATOMICGUI_DeleteOp.cxx \ - ATOMICGUI_ImportExportOp.h \ - ATOMICGUI_ImportExportOp.cxx - -# MOC pre-processing -MOC_FILES = \ - ATOMICGUI_moc.cxx \ - ATOMICGUI_DataModel_moc.cxx \ - ATOMICGUI_AddAtomDlg_moc.cxx \ - ATOMICGUI_Operation_moc.cxx \ - ATOMICGUI_CreateMolOp_moc.cxx \ - ATOMICGUI_DeleteOp_moc.cxx \ - ATOMICGUI_RenameOp_moc.cxx \ - ATOMICGUI_ImportExportOp_moc.cxx \ - ATOMICGUI_AddAtomOp_moc.cxx - -nodist_libATOMIC_la_SOURCES = $(MOC_FILES) - -# additionnal compilation flags -libATOMIC_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(GUI_CXXFLAGS) \ - -I$(top_builddir) - -# additionnal linkage flags -libATOMIC_la_LDFLAGS = \ - $(GUI_LDFLAGS) \ - -lLightApp - -# resources files -nodist_salomeres_DATA = \ - ATOMIC_images.qm \ - ATOMIC_msg_en.qm diff --git a/src/AtomicPy/AtomicPy.sip b/src/AtomicPy/AtomicPy.sip index ee855e5..0b4fede 100644 --- a/src/AtomicPy/AtomicPy.sip +++ b/src/AtomicPy/AtomicPy.sip @@ -28,7 +28,8 @@ #include %End -class AtomicMolecule /NoDefaultCtors/ +class AtomicMolecule +/NoDefaultCtors/ { public: AtomicMolecule( const QString& name ) /Transfer/; diff --git a/src/AtomicPy/CMakeLists.txt b/src/AtomicPy/CMakeLists.txt new file mode 100755 index 0000000..5c5b267 --- /dev/null +++ b/src/AtomicPy/CMakeLists.txt @@ -0,0 +1,75 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseQt4Ext) +INCLUDE(UsePyQt4) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + $(QT_INCLUDES) + ${GUI_INCLUDE_DIRS} + ${SIP_INCLUDE_DIR} + ${PYTHON_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/ATOMICGUI +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${QT_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${QT_LIBRARIES} + ${GUI_LightApp} + ATOMIC +) + +# --- headers --- + +# header files / no moc processing +SET(AtomicPy_HEADERS + AtomicPy.h +) + +# --- sources --- + +# sources / static +SET(_other_SOURCES + AtomicPy.cxx +) + +# sip files / to be processed by sip +SET(_sip_files AtomicPy.sip) + +# sources / sip wrappings +PYQT4_WRAP_SIP(_sip_SOURCES ${_sip_files}) + +# sources / to compile +SET(AtomicPy_SOURCES ${_other_SOURCES} ${_sip_SOURCES}) + +# --- rules --- + +ADD_LIBRARY(AtomicPy ${AtomicPy_SOURCES}) +TARGET_LINK_LIBRARIES(AtomicPy ${_link_LIBRARIES}) +INSTALL(TARGETS AtomicPy EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${AtomicPy_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/AtomicPy/Makefile.am b/src/AtomicPy/Makefile.am deleted file mode 100644 index 451643c..0000000 --- a/src/AtomicPy/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Roman NIKOLAEV -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -lib_LTLIBRARIES = libAtomicPy.la - -# extra source files (generated by sip) -SIP_SRC = sipAPIAtomicPy.h \ - sipAtomicPyAtomicMolecule.cc \ - sipAtomicPycmodule.cc - -# Sip definition file -SIP_FILES = AtomicPy.sip - -# extra dist files -EXTRA_DIST += $(SIP_FILES) - -# extra clean files -CLEANFILES = $(SIP_SRC) - -dist_libAtomicPy_la_SOURCES = AtomicPy.h AtomicPy.cxx - -nodist_libAtomicPy_la_SOURCES = $(SIP_SRC) - -# compilation flags -libAtomicPy_la_CPPFLAGS = $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ - $(GUI_CXXFLAGS) -I$(srcdir)/../ATOMICGUI - -libAtomicPy_la_LIBADD = $(PYTHON_LIBS) $(SIP_LIBS) \ - ../ATOMICGUI/libATOMIC.la - -# custom build step: generate C++ wrapping according to $(SIP_FILES) -$(SIP_SRC): $(SIP_FILES) - $(SIP) $(PYQT_SIPFLAGS) $< - -# custom install step: create symbolic link -install-exec-hook: - (cd $(DESTDIR)$(libdir); ln -sf libAtomicPy.so AtomicPy.so) - -# custom uninstall step: remove symbolic link -uninstall-hook: - rm -f $(DESTDIR)$(libdir)/AtomicPy.so \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100755 index 0000000..daff8aa --- /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 + ATOMICGUI AtomicPy +) + +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 e55d1ef..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = ATOMICGUI AtomicPy