From: rnv Date: Thu, 26 Sep 2013 14:18:57 +0000 (+0000) Subject: Porting COMPONENT module to the CMake build system: initial version. X-Git-Tag: V7_3_0a1~11 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=09e6adcc471b53fd56bde18af7bb92bf3c9192a1;p=samples%2Fcomponent.git Porting COMPONENT module to the CMake build system: initial version. --- diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100755 index 0000000..dd3f6bc --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,173 @@ +# 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(SalomeCOMPONENT 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 "COMPONENT 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 COMPONENT documentation" ${SALOME_BUILD_DOC}) For use in the future + +## +## COMPONENT specifics +## + +# Python +FIND_PACKAGE(SalomePython REQUIRED) +# SWIG +FIND_PACKAGE(SalomeSWIG REQUIRED) +# CORBA +FIND_PACKAGE(SalomeOmniORB REQUIRED) +FIND_PACKAGE(SalomeOmniORBPy REQUIRED) + +# Directories +# (default values taken from KERNEL) +# =========== +SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries") +SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_IDLS "${SALOME_INSTALL_IDLS}" CACHE PATH "Install path: SALOME IDL files") +SET(SALOME_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "Install path: SALOME headers") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH + "Install path: SALOME scripts") +SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH + "Install path: SALOME script data") +SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH + "Install path: SALOME Python scripts") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH + "Install path: SALOME application skeleton - scripts") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH + "Install path: SALOME application skeleton - Python") +SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff") +SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH + "Install path: SALOME Python shared modules") +SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH + "Install path: local SALOME CMake files") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH + "Install path: local SALOME config files (obsolete, to be removed)") +SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") +SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") + +# Specific to COMPONENT: +SET(SALOME_COMPONENT_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/component" CACHE PATH + "Install path: SALOME COMPONENT 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_COMPONENT_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(COMPONENT_version.h.in COMPONENT_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 + AddComponentEngine AdditionComponentEngine DivComponentEngine + MulComponentEngine SubComponentEngine SyrComponentEngine DynInvoke + TypesCheckEngine DataStreamFactoryEngine SIGNALSComponentEngine + UndefinedSymbolComponentEngine SalomeIDLCOMPONENT +) + +# 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(KERNEL_ROOT_DIR "${KERNEL_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) + +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/COMPONENT_version.h.in b/COMPONENT_version.h.in index da9014d..83c14d4 100644 --- a/COMPONENT_version.h.in +++ b/COMPONENT_version.h.in @@ -27,12 +27,22 @@ #if !defined(__COMPONENT_VERSION_H__) #define __COMPONENT_VERSION_H__ -/* - COMPONENT_VERSION is (major << 16) + (minor << 8) + patch. +/*! + Specify version of SALOME COMPONENT module, as follows + + COMPONENT_VERSION_MAJOR : (integer) number identifying major version + COMPONENT_VERSION_MINOR : (integer) number identifying minor version + COMPONENT_VERSION_MAINTENANCE : (integer) number identifying maintenance version + COMPONENT_VERSION_STR : (string) complete version number "major.minor.maintenance" + COMPONENT_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + COMPONENT_DEVELOPMENT : (integer) indicates development version when set to 1 */ -#define COMPONENT_VERSION_STR "@VERSION@" -#define COMPONENT_VERSION @XVERSION@ -#define COMPONENT_DEVELOPMENT @VERSION_DEV@ +#define COMPONENT_VERSION_MAJOR @SALOMECOMPONENT_MAJOR_VERSION@ +#define COMPONENT_VERSION_MINOR @SALOMECOMPONENT_MINOR_VERSION@ +#define COMPONENT_VERSION_MAINTENANCE @SALOMECOMPONENT_PATCH_VERSION@ +#define COMPONENT_VERSION_STR "@SALOMECOMPONENT_VERSION@" +#define COMPONENT_VERSION @SALOMECOMPONENT_XVERSION@ +#define COMPONENT_DEVELOPMENT @SALOMECOMPONENT_VERSION_DEV@ #endif // __COMPONENT_VERSION_H__ diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 34261d7..0000000 --- a/Makefile.am +++ /dev/null @@ -1,42 +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 -# - -# -* 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 - -SUBDIRS = idl adm_local resources src bin - -DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool - -salomeinclude_DATA = COMPONENT_version.h - -EXTRA_DIST += \ - build_configure \ - clean_configure - -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..428324a --- /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 + FindCOMPONENT.cmake + FindSalomeCOMPONENT.cmake +) +INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindCOMPONENT.cmake b/adm_local/cmake_files/FindCOMPONENT.cmake new file mode 100644 index 0000000..0c27091 --- /dev/null +++ b/adm_local/cmake_files/FindCOMPONENT.cmake @@ -0,0 +1,34 @@ +# 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(COMPONENT_CXXFLAGS -I${COMPONENT_ROOT_DIR}/include/salome) + +FIND_LIBRARY(AddComponentEngine AddComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(AdditionComponentEngine AdditionComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(DataStreamFactoryEngine DataStreamFactoryEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(DivComponentEngine DivComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(MulComponentEngine MulComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SIGNALSComponentEngine SIGNALSComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SubComponentEngine SubComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SyrComponentEngine SyrComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(DynInvoke DynInvoke ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(TypesCheckEngine TypesCheckEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(UndefinedSymbolComponentEngine UndefinedSymbolComponentEngine ${COMPONENT_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomeIDLCOMPONENT SalomeIDLCOMPONENT ${COMPONENT_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/FindSalomeCOMPONENT.cmake b/adm_local/cmake_files/FindSalomeCOMPONENT.cmake new file mode 100644 index 0000000..a27e90b --- /dev/null +++ b/adm_local/cmake_files/FindSalomeCOMPONENT.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 SalomeCOMPONENT_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome COMPONENT ...") +ENDIF() + +SET(CMAKE_PREFIX_PATH "${COMPONENT_ROOT_DIR}") + +SALOME_FIND_PACKAGE(SalomeCOMPONENT SalomeCOMPONENT CONFIG) + +IF(NOT SalomeCOMPONENT_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome COMPONENT: ${COMPONENT_ROOT_DIR}") +ENDIF() diff --git a/adm_local/cmake_files/SalomeCOMPONENTConfig.cmake.in b/adm_local/cmake_files/SalomeCOMPONENTConfig.cmake.in new file mode 100644 index 0000000..466e0de --- /dev/null +++ b/adm_local/cmake_files/SalomeCOMPONENTConfig.cmake.in @@ -0,0 +1,109 @@ +# - 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 AddComponentEngine AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(COMPONENT_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(COMPONENT_INCLUDE_DIRS "${COMPONENT_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@) + +# Level 1 prerequisites: +SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") + +# For all prerequisites, load the corresponding targets if the package was used +# in CONFIG mode. This ensures dependent projects link correctly +# without having to set LD_LIBRARY_PATH: +SET(_PREREQ ) +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 KERNEL targets if they were not already loaded: +IF(NOT (TARGET SALOMEBasics)) + INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") +ENDIF() + +# Exposed COMPONENT targets: +SET(COMPONENT_AddComponentEngine AddComponentEngine) +SET(COMPONENT_AdditionComponentEngine AdditionComponentEngine) +SET(COMPONENT_DivComponentEngine DivComponentEngine) +SET(COMPONENT_MulComponentEngine MulComponentEngine) +SET(COMPONENT_SubComponentEngine SubComponentEngine) +SET(COMPONENT_SyrComponentEngine SyrComponentEngine) +SET(COMPONENT_TypesCheckEngine TypesCheckEngine) +SET(COMPONENT_DataStreamFactoryEngine DataStreamFactoryEngine) +SET(COMPONENT_SIGNALSComponentEngine SIGNALSComponentEngine) +SET(COMPONENT_UndefinedSymbolComponentEngine UndefinedSymbolComponentEngine) +SET(COMPONENT_DynInvoke DynInvoke) +SET(COMPONENT_SalomeIDLCOMPONENT ${SalomeIDLCOMPONENT}) \ 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..337d672 --- /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_COMPONENT.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 2c5d387..0000000 --- a/adm_local/unix/config_files/Makefile.am +++ /dev/null @@ -1,23 +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_COMPONENT.m4 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am deleted file mode 100644 index e6cf13e..0000000 --- a/adm_local/unix/make_common_starter.am +++ /dev/null @@ -1,94 +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 idl files -salomeidldir = $(prefix)/idl/salome - -# Directory for installing resource files -salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ - -# Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files - -# Shared modules installation directory -sharedpkgpythondir = $(salomepythondir)/shared_modules - -# Documentation directory -docdir = $(datadir)/doc/salome - -# common rules - -# meta object implementation files generation (moc) -%_moc.cxx: %.h - $(MOC) $< -o $@ - -# translation (*.qm) files generation (lrelease) -%.qm: %.ts - $(LRELEASE) $< -qm $@ - -# resource files generation (qrcc) -qrc_%.cxx: %.qrc - $(QRCC) $< -o $@ -name $(*F) - -# qt forms files generation (uic) -ui_%.h: %.ui - $(UIC) -o $@ $< - -# extra distributed files -EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) - -# customize clean operation -mostlyclean-local: - rm -f @builddir@/*_moc.cxx - rm -f @builddir@/*.qm - rm -f @builddir@/ui_*.h - rm -f @builddir@/qrc_*.cxx - -# tests -tests: unittest - -unittest: $(UNIT_TEST_PROG) - @if test "x$(UNIT_TEST_PROG)" != "x"; then \ - $(UNIT_TEST_PROG); \ - fi; diff --git a/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 5669d58..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 -# - -# -* Makefile *- -# Author : Guillaume Boulant (CSSI) -# Module : COMPONENT -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -nodist_salomescript_DATA = VERSION diff --git a/bin/VERSION.in b/bin/VERSION.in index 377499b..ca9558a 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ -[SALOME COMPONENT] : @VERSION@ -[DEVELOPMENT] : @VERSION_DEV@ +[SALOME COMPONENT] : @SALOMECOMPONENT_VERSION@ +[DEVELOPMENT] : @SALOMECOMPONENT_VERSION_DEV@ [DESCRIPTION] : Sample SALOME module diff --git a/build_configure b/build_configure deleted file mode 100755 index 08344ad..0000000 --- a/build_configure +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh -# 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 -# - -# Tool for updating list of .in file for the SALOME project -# and regenerating configure script -# Author : Marc Tajchman - CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Date : 10/10/2002 -# $Header$ -# -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 KERNEL_SRC is set correctly - -#if test ! -d "${KERNEL_SRC}"; then -# echo "failed : KERNEL_SRC variable is not correct !" -# exit -#fi - -# ######################################################################## -# # Test if the MED_ROOT_DIR is set correctly - -# if test ! -d "${MED_ROOT_DIR}"; then -# echo "failed : MED_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 ${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 4939051..0000000 --- a/clean_configure +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# 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 100644 index 905be2e..0000000 --- a/configure.ac +++ /dev/null @@ -1,382 +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 -# - -# 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 COMPONENT module], [7.2.0], [webmaster.salome@opencascade.com], [SalomeCOMPONENT]) -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=component -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 - -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 -c" - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_CXX_WARNINGS -AC_CXX_TEMPLATE_OPTIONS -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl Library librt : for alpha/osf -AC_CHECK_LIB(rt,nanosleep) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -AC_CXX_USE_STD_IOSTREAM -AC_CXX_HAVE_SSTREAM - -dnl -dnl --------------------------------------------- -dnl testing linker -dnl --------------------------------------------- -dnl - -AC_LINKER_OPTIONS - -AC_LINKER_OPTIONS - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -dnl -dnl --------------------------------------------- -dnl testing MPI -dnl --------------------------------------------- -dnl - -echo -echo --------------------------------------------- -echo testing MPI -echo --------------------------------------------- -echo - -CHECK_MPI - -dnl -dnl --------------------------------------------- -dnl testing sockets -dnl --------------------------------------------- -dnl - -CHECK_SOCKETS - -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 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 HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -# echo -# echo --------------------------------------------- -# echo testing MED -# echo --------------------------------------------- -# echo - -# CHECK_MED - -# echo -# echo --------------------------------------------- -# echo testing MED3 -# echo --------------------------------------------- -# echo - -# CHECK_MED3 - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok" - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -echo "---Optional:" -variables="mpi_ok cppunit_ok doxygen_ok graphviz_ok" - -for var in $variables -do - eval toto=\$$var - if test x$toto != "x"; then - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var - fi -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 \ - COMPONENT_version.h \ - src/Makefile \ - src/AddComponent/Makefile \ - src/AdditionComponent/Makefile \ - src/DataStreamComponent/Makefile \ - src/DivComponent/Makefile \ - src/FactorialComponent/Makefile \ - src/MulComponent/Makefile \ - src/SIGNALSComponent/Makefile \ - src/SIGNALSComponent_Swig/Makefile \ - src/SubComponent/Makefile \ - src/SyrComponent/Makefile \ - src/SyrControlComponent/Makefile \ - src/TestFunctions/Makefile \ - src/TypesCheck/Makefile \ - src/UndefinedSymbolComponent/Makefile \ - resources/Makefile \ - resources/COMPONENTCatalog.xml \ - resources/SalomeApp.xml \ - idl/Makefile \ - Makefile \ -]) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt new file mode 100755 index 0000000..e2ba42c --- /dev/null +++ b/idl/CMakeLists.txt @@ -0,0 +1,55 @@ +# 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} + ${MED_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl +) + +SET(SalomeIDLCOMPONENT_IDLSOURCES + AddComponent.idl + AdditionComponent.idl + DivComponent.idl + FactorialComponent.idl + MulComponent.idl + SubComponent.idl + SyrComponent.idl + SyrControlComponent.idl + TypesCheck.idl + DataStreamComponent.idl + SIGNALSComponent.idl + UndefinedSymbolComponent.idl +) + +SET(_idl_include_dirs + ${KERNEL_ROOT_DIR}/idl/salome + ${MED_ROOT_DIR}/idl/salome +) + +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} + ${MED_SalomeIDLMED} +) + +OMNIORB_ADD_MODULE(SalomeIDLCOMPONENT "${SalomeIDLCOMPONENT_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLCOMPONENT EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) \ No newline at end of file diff --git a/idl/Makefile.am b/idl/Makefile.am deleted file mode 100644 index 7bc99e8..0000000 --- a/idl/Makefile.am +++ /dev/null @@ -1,151 +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 -# - -# 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 = \ - AddComponent.idl \ - AdditionComponent.idl \ - DivComponent.idl \ - FactorialComponent.idl \ - MulComponent.idl \ - SubComponent.idl \ - SyrComponent.idl \ - SyrControlComponent.idl \ - TypesCheck.idl \ - DataStreamComponent.idl \ - SIGNALSComponent.idl \ - UndefinedSymbolComponent.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 = libSalomeIDLCOMPONENT.la - -# Sources built from idl files -BASEIDL_SOURCES =\ - AddComponentSK.cc \ - AdditionComponentSK.cc \ - DivComponentSK.cc \ - FactorialComponentSK.cc \ - MulComponentSK.cc \ - SubComponentSK.cc \ - SyrComponentSK.cc \ - SyrControlComponentSK.cc \ - TypesCheckSK.cc \ - DataStreamComponentSK.cc \ - SIGNALSComponentSK.cc \ - UndefinedSymbolComponentSK.cc -DYNIDL_SOURCES = \ - AddComponentDynSK.cc \ - AdditionComponentDynSK.cc \ - DivComponentDynSK.cc \ - FactorialComponentDynSK.cc \ - MulComponentDynSK.cc \ - SubComponentDynSK.cc \ - SyrComponentDynSK.cc \ - SyrControlComponentDynSK.cc \ - TypesCheckDynSK.cc \ - DataStreamComponentDynSK.cc \ - SIGNALSComponentDynSK.cc \ - UndefinedSymbolComponentDynSK.cc - -nodist_libSalomeIDLCOMPONENT_la_SOURCES = ${BASEIDL_SOURCES} ${DYNIDL_SOURCES} -${DYNIDL_SOURCES}: ${BASEIDL_SOURCES} - -# header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) - -libSalomeIDLCOMPONENT_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ \ - @CORBA_INCLUDES@ - -libSalomeIDLCOMPONENT_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLCOMPONENT_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 AdditionComponent DataStreamComponent SuperVisionTest ; 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..b5d5cc1 --- /dev/null +++ b/resources/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 +# + +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_COMPONENT_INSTALL_RES_DATA}) +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/COMPONENTCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/COMPONENTCatalog.xml INSTALL ${SALOME_COMPONENT_INSTALL_RES_DATA}) \ No newline at end of file diff --git a/resources/COMPONENTCatalog.xml.in b/resources/COMPONENTCatalog.xml.in index eab95fe..55c882a 100644 --- a/resources/COMPONENTCatalog.xml.in +++ b/resources/COMPONENTCatalog.xml.in @@ -48,7 +48,7 @@ AddComponent SuperVisionTest MTJ - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test: Addition 0 1 @@ -511,7 +511,7 @@ AdditionComponent SuperVisionTest JR - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test: Addition 0 1 @@ -974,7 +974,7 @@ SubComponent SuperVisionTest MTJ - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test: Subtraction 0 1 @@ -1022,7 +1022,7 @@ MulComponent SuperVisionTest MTJ - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test: Multiplication 0 1 @@ -1070,7 +1070,7 @@ DivComponent SuperVisionTest MTJ - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test: Division 0 1 @@ -1117,7 +1117,7 @@ SyrComponent SuperVisionTest JR - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test 1 1 @@ -1561,7 +1561,7 @@ FactorialComponent SuperVisionTest Malvagi, Tajchman - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test: Factorial 0 @@ -1626,7 +1626,7 @@ SyrControlComponent SuperVisionTest JR - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test 1 0 @@ -1856,7 +1856,7 @@ TypesCheck - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test 1 1 @@ -2135,7 +2135,7 @@ DataStreamFactory OTHER jr - @VERSION@ + @SALOMECOMPONENT_VERSION@ SuperVision test 1 @@ -2614,7 +2614,7 @@ SIGNALSComponent OTHER jr - @VERSION@ + @SALOMECOMPONENT_VERSION@ unknown 1 1 @@ -2675,7 +2675,7 @@ UndefinedSymbolComponent OTHER jr - @VERSION@ + @SALOMECOMPONENT_VERSION@ unknown 1 1 diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index 956d298..0000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,29 +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 -# - -# -* 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 - -# VSR: little trick to avoid putting if COMPONENTCatalog.xml to the distribution archive -nodist_salomeres_SCRIPTS = COMPONENTCatalog.xml SalomeApp.xml diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index abd39c9..cb7a377 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -25,7 +25,7 @@
- +
diff --git a/src/AddComponent/CMakeLists.txt b/src/AddComponent/CMakeLists.txt new file mode 100644 index 0000000..5cf248f --- /dev/null +++ b/src/AddComponent/CMakeLists.txt @@ -0,0 +1,86 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_SALOMEBasics} + ${KERNEL_ResourcesManager} + ${KERNEL_SalomeIDLKERNEL} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(AddComponentEngine_HEADERS + AddComponent_Impl.hxx + Adder_Impl.hxx +) + +# --- sources --- + +# sources / static +SET(AddComponentEngine_SOURCES + AddComponent_Impl.cxx + Adder_Impl.cxx +) + +# bin programs +SET(AddComponent_CheckOfUndefined_SOURCES + AddComponent_CheckOfUndefined.cxx + HandleServerSideSignals.cxx +) + +# --- rules --- + +ADD_LIBRARY(AddComponentEngine ${AddComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(AddComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS AddComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(AddComponent_CheckOfUndefined ${AddComponent_CheckOfUndefined_SOURCES}) +TARGET_LINK_LIBRARIES(AddComponent_CheckOfUndefined ${_link_LIBRARIES}) +INSTALL(TARGETS AddComponent_CheckOfUndefined EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${AddComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/AddComponent/HandleServerSideSignals.cxx b/src/AddComponent/HandleServerSideSignals.cxx index 42644e2..125293d 100644 --- a/src/AddComponent/HandleServerSideSignals.cxx +++ b/src/AddComponent/HandleServerSideSignals.cxx @@ -21,7 +21,7 @@ // #include -#include +#include #include "utilities.h" // CCRT porting diff --git a/src/AddComponent/Makefile.am b/src/AddComponent/Makefile.am deleted file mode 100755 index 13105f2..0000000 --- a/src/AddComponent/Makefile.am +++ /dev/null @@ -1,80 +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 -# - -# SuperVisionTest AddComponent : example of component that adds two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - AddComponent_Impl.hxx \ - Adder_Impl.hxx - -# Libraries targets -lib_LTLIBRARIES = libAddComponentEngine.la -dist_libAddComponentEngine_la_SOURCES = \ - AddComponent_Impl.cxx \ - Adder_Impl.cxx - -# Executables targets -bin_PROGRAMS = AddComponent_CheckOfUndefined -dist_AddComponent_CheckOfUndefined_SOURCES = \ - AddComponent_CheckOfUndefined.cxx \ - HandleServerSideSignals.cxx - -${bin_PROGRAMS}: ${lib_LTLIBRARIES} - -libAddComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libAddComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeHDFPersist \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSALOMELocalTrace \ - -lSalomeLifeCycleCORBA \ - -lSalomeResourcesManager \ - -lSALOMEBasics \ - -lSalomeIDLKernel \ - -lResourcesManager - -AddComponent_CheckOfUndefined_CPPFLAGS = \ - $(libAddComponentEngine_la_CPPFLAGS) - -AddComponent_CheckOfUndefined_LDFLAGS = \ - ./libAddComponentEngine.la \ - $(libAddComponentEngine_la_LDFLAGS) \ - $(CORBA_LIBS) \ - $(PYTHON_LIBS) - diff --git a/src/AdditionComponent/CMakeLists.txt b/src/AdditionComponent/CMakeLists.txt new file mode 100644 index 0000000..d2be5cc --- /dev/null +++ b/src/AdditionComponent/CMakeLists.txt @@ -0,0 +1,86 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/AddComponent + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_ResourcesManager} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(AdditionComponentEngine_HEADERS + Addition_Adder_Impl.hxx + AdditionComponent_Impl.hxx +) + +# --- sources --- + +# sources / static +SET(AdditionComponentEngine_SOURCES + Addition_Adder_Impl.cxx + AdditionComponent_Impl.cxx +) + +# bin programs +SET(AdditionComponent_CheckOfUndefined_SOURCES + AdditionComponent_CheckOfUndefined.cxx +) + +# --- rules --- + +ADD_LIBRARY(AdditionComponentEngine ${AdditionComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(AdditionComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS AdditionComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(AdditionComponent_CheckOfUndefined ${AdditionComponent_CheckOfUndefined_SOURCES}) +TARGET_LINK_LIBRARIES(AdditionComponent_CheckOfUndefined ${_link_LIBRARIES}) +INSTALL(TARGETS AdditionComponent_CheckOfUndefined EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${AdditionComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/AdditionComponent/Makefile.am b/src/AdditionComponent/Makefile.am deleted file mode 100755 index a6a4d5b..0000000 --- a/src/AdditionComponent/Makefile.am +++ /dev/null @@ -1,78 +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 -# - -# SuperVisionTest AddComponent : example of component that adds two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - AdditionComponent_Impl.hxx \ - Addition_Adder_Impl.hxx - -# Libraries targets -lib_LTLIBRARIES = libAdditionComponentEngine.la -dist_libAdditionComponentEngine_la_SOURCES = \ - AdditionComponent_Impl.cxx \ - Addition_Adder_Impl.cxx - -# Executables targets -bin_PROGRAMS = AdditionComponent_CheckOfUndefined -dist_AdditionComponent_CheckOfUndefined_SOURCES = \ - AdditionComponent_CheckOfUndefined.cxx - -${bin_PROGRAMS}: ${lib_LTLIBRARIES} - -libAdditionComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../AddComponent \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libAdditionComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeHDFPersist \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSALOMELocalTrace \ - -lSalomeLifeCycleCORBA \ - -lSalomeResourcesManager \ - -lResourcesManager \ - -lSALOMEBasics \ - -lSalomeIDLKernel - -AdditionComponent_CheckOfUndefined_CPPFLAGS = \ - $(libAdditionComponentEngine_la_CPPFLAGS) - -AdditionComponent_CheckOfUndefined_LDFLAGS = \ - ./libAdditionComponentEngine.la \ - $(libAdditionComponentEngine_la_LDFLAGS) \ - $(CORBA_LIBS) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100755 index 0000000..756064d --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,46 @@ +# 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 + AddComponent + AdditionComponent + DivComponent + FactorialComponent + MulComponent + SubComponent + SyrComponent + SyrControlComponent + TypesCheck + DataStreamComponent + SIGNALSComponent + UndefinedSymbolComponent + SIGNALSComponent_Swig + TestFunctions +) + +SET(SUBDIRS + ${SUBDIRS_COMMON} +) + +FOREACH(dir ${SUBDIRS}) + ADD_SUBDIRECTORY(${dir}) +ENDFOREACH(dir ${SUBDIRS}) diff --git a/src/DataStreamComponent/CMakeLists.txt b/src/DataStreamComponent/CMakeLists.txt new file mode 100644 index 0000000..ecd9562 --- /dev/null +++ b/src/DataStreamComponent/CMakeLists.txt @@ -0,0 +1,84 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/AddComponent + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_ResourcesManager} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(DataStreamFactoryEngine_HEADERS + DataStreamComponent_Impl.hxx +) + +# --- sources --- + +# sources / static +SET(DataStreamFactoryEngine_SOURCES + DataStreamComponent_Impl.cxx +) + +# bin programs +SET(DataStreamComponent_CheckOfUndefined_SOURCES + DataStreamComponent_CheckOfUndefined.cxx +) + +# --- rules --- + +ADD_LIBRARY(DataStreamFactoryEngine ${DataStreamFactoryEngine_SOURCES}) +TARGET_LINK_LIBRARIES(DataStreamFactoryEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS DataStreamFactoryEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(DataStreamComponent_CheckOfUndefined ${DataStreamComponent_CheckOfUndefined_SOURCES}) +TARGET_LINK_LIBRARIES(DataStreamComponent_CheckOfUndefined ${_link_LIBRARIES}) +INSTALL(TARGETS DataStreamComponent_CheckOfUndefined EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${DataStreamFactoryEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DataStreamComponent/Makefile.am b/src/DataStreamComponent/Makefile.am deleted file mode 100644 index 4c6bfc1..0000000 --- a/src/DataStreamComponent/Makefile.am +++ /dev/null @@ -1,77 +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 -# - -# SUPERV DataStreamComponent : example of component -# File : Makefile.in -# Author : Jean Rahuel -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SUPERV -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DataStreamComponent_Impl.hxx - -# Libraries targets -lib_LTLIBRARIES = libDataStreamFactoryEngine.la -dist_libDataStreamFactoryEngine_la_SOURCES = \ - DataStreamComponent_Impl.cxx - -# Executables targets -bin_PROGRAMS = DataStreamComponent_CheckOfUndefined - -${bin_PROGRAMS}: ${lib_LTLIBRARIES} - -dist_DataStreamComponent_CheckOfUndefined_SOURCES = \ - DataStreamComponent_CheckOfUndefined.cxx - -libDataStreamFactoryEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../AddComponent \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libDataStreamFactoryEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSALOMELocalTrace \ - -lSalomeResourcesManager \ - -lSALOMEBasics \ - -lSalomeIDLKernel \ - -lSalomeHDFPersist \ - -lResourcesManager - -DataStreamComponent_CheckOfUndefined_CPPFLAGS = \ - $(libDataStreamFactoryEngine_la_CPPFLAGS) - -DataStreamComponent_CheckOfUndefined_LDFLAGS = \ - ./libDataStreamFactoryEngine.la \ - $(libDataStreamFactoryEngine_la_LDFLAGS) \ - $(CORBA_LIBS) diff --git a/src/DivComponent/CMakeLists.txt b/src/DivComponent/CMakeLists.txt new file mode 100644 index 0000000..64282c8 --- /dev/null +++ b/src/DivComponent/CMakeLists.txt @@ -0,0 +1,67 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(DivComponentEngine_HEADERS + DivComponent.hxx +) + +# --- sources --- + +# sources / static +SET(DivComponentEngine_SOURCES + DivComponent.cxx +) + +# --- rules --- + +ADD_LIBRARY(DivComponentEngine ${DivComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(DivComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS DivComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${DivComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DivComponent/Makefile.am b/src/DivComponent/Makefile.am deleted file mode 100755 index c581e95..0000000 --- a/src/DivComponent/Makefile.am +++ /dev/null @@ -1,54 +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 -# - -# SuperVisionTest DivComponent : example of component that devides two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DivComponent.hxx - -# Libraries targets -lib_LTLIBRARIES = libDivComponentEngine.la -dist_libDivComponentEngine_la_SOURCES = \ - DivComponent.cxx - -libDivComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libDivComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification diff --git a/src/FactorialComponent/CMakeLists.txt b/src/FactorialComponent/CMakeLists.txt new file mode 100644 index 0000000..7602b44 --- /dev/null +++ b/src/FactorialComponent/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 +# + +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + FactorialComponent.py +) + +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON}) \ No newline at end of file diff --git a/src/FactorialComponent/Makefile.am b/src/FactorialComponent/Makefile.am deleted file mode 100644 index 8b5ba8c..0000000 --- a/src/FactorialComponent/Makefile.am +++ /dev/null @@ -1,29 +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 -# - -# SuperVisionTest FactorialComponent : example of component that calculates factorial -# File : Makefile.in -# Author : Fausto MALVAGI - Marc TAJCHMAN -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomescript_DATA = \ - FactorialComponent.py diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100755 index a10128a..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,43 +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.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - - -SUBDIRS = \ - AddComponent \ - AdditionComponent \ - DivComponent \ - FactorialComponent \ - MulComponent \ - SubComponent \ - SyrComponent \ - SyrControlComponent \ - TypesCheck \ - DataStreamComponent \ - SIGNALSComponent \ - UndefinedSymbolComponent \ - SIGNALSComponent_Swig \ - TestFunctions diff --git a/src/MulComponent/CMakeLists.txt b/src/MulComponent/CMakeLists.txt new file mode 100644 index 0000000..686e203 --- /dev/null +++ b/src/MulComponent/CMakeLists.txt @@ -0,0 +1,67 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(MulComponentEngine_HEADERS + MulComponent.hxx +) + +# --- sources --- + +# sources / static +SET(MulComponentEngine_SOURCES + MulComponent.cxx +) + +# --- rules --- + +ADD_LIBRARY(MulComponentEngine ${MulComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(MulComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS MulComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${MulComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MulComponent/Makefile.am b/src/MulComponent/Makefile.am deleted file mode 100755 index ddb11ab..0000000 --- a/src/MulComponent/Makefile.am +++ /dev/null @@ -1,53 +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 -# - -# SuperVisionTest MulComponent : example of component that multiplies two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - MulComponent.hxx - -# Libraries targets -lib_LTLIBRARIES = libMulComponentEngine.la -dist_libMulComponentEngine_la_SOURCES = \ - MulComponent.cxx - -libMulComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libMulComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification diff --git a/src/SIGNALSComponent/CMakeLists.txt b/src/SIGNALSComponent/CMakeLists.txt new file mode 100644 index 0000000..0bb0286 --- /dev/null +++ b/src/SIGNALSComponent/CMakeLists.txt @@ -0,0 +1,80 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_ResourcesManager} + ${KERNEL_SalomeIDLKERNEL} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(SIGNALSComponentEngine_HEADERS + SIGNALSComponent_Impl.hxx +) + +# --- sources --- + +# sources / static +SET(SIGNALSComponentEngine_SOURCES + SIGNALSComponent_Impl.cxx +) + +# bin programs +SET(SIGNALSComponent_CheckOfUndefined_SOURCES + HandleServerSideSignals.cxx + SIGNALSComponent_CheckOfUndefined.cxx +) + +# --- rules --- + +ADD_LIBRARY(SIGNALSComponentEngine ${SIGNALSComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(SIGNALSComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS SIGNALSComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(SIGNALSComponent_CheckOfUndefined ${SIGNALSComponent_CheckOfUndefined_SOURCES}) +TARGET_LINK_LIBRARIES(SIGNALSComponent_CheckOfUndefined ${_link_LIBRARIES}) +INSTALL(TARGETS SIGNALSComponent_CheckOfUndefined EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${SIGNALSComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SIGNALSComponent/HandleServerSideSignals.cxx b/src/SIGNALSComponent/HandleServerSideSignals.cxx index 42644e2..125293d 100644 --- a/src/SIGNALSComponent/HandleServerSideSignals.cxx +++ b/src/SIGNALSComponent/HandleServerSideSignals.cxx @@ -21,7 +21,7 @@ // #include -#include +#include #include "utilities.h" // CCRT porting diff --git a/src/SIGNALSComponent/Makefile.am b/src/SIGNALSComponent/Makefile.am deleted file mode 100755 index 1438bba..0000000 --- a/src/SIGNALSComponent/Makefile.am +++ /dev/null @@ -1,75 +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 -# - -# SuperVisionTest SIGNALSComponent : example of component that devides two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SIGNALSComponent_Impl.hxx - -# Libraries targets -lib_LTLIBRARIES = libSIGNALSComponentEngine.la -dist_libSIGNALSComponentEngine_la_SOURCES = \ - SIGNALSComponent_Impl.cxx - -bin_PROGRAMS = SIGNALSComponent_CheckOfUndefined -dist_SIGNALSComponent_CheckOfUndefined_SOURCES = \ - SIGNALSComponent_CheckOfUndefined.cxx \ - HandleServerSideSignals.cxx - -${bin_PROGRAMS}: ${lib_LTLIBRARIES} - -libSIGNALSComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libSIGNALSComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lSALOMEBasics \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSalomeHDFPersist \ - -lSalomeIDLKernel \ - -lResourcesManager - -SIGNALSComponent_CheckOfUndefined_CPPFLAGS = \ - $(libSIGNALSComponentEngine_la_CPPFLAGS) - -SIGNALSComponent_CheckOfUndefined_LDFLAGS = \ - ./libSIGNALSComponentEngine.la \ - $(libSIGNALSComponentEngine_la_LDFLAGS) \ - $(CORBA_LIBS) \ - $(PYTHON_LIBS) \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace diff --git a/src/SIGNALSComponent_Swig/CMakeLists.txt b/src/SIGNALSComponent_Swig/CMakeLists.txt new file mode 100644 index 0000000..4558563 --- /dev/null +++ b/src/SIGNALSComponent_Swig/CMakeLists.txt @@ -0,0 +1,67 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(${SWIG_USE_FILE}) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/SIGNALSComponent + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + SIGNALSComponentEngine +) + +# swig flags +SET_SOURCE_FILES_PROPERTIES(libSIGNALSComponent_Swig.i PROPERTIES CPLUSPLUS ON) +SET_SOURCE_FILES_PROPERTIES(libSIGNALSComponent_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libSIGNALSComponent_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") + +# --- scripts --- + +# scripts / swig wrappings +SET(_swig_SCRIPTS + ${CMAKE_CURRENT_BINARY_DIR}/libSIGNALSComponent_Swig.py +) + +# --- rules --- + +SWIG_ADD_MODULE(libSIGNALSComponent_Swig python libSIGNALSComponent_Swig.i) +SWIG_LINK_LIBRARIES(libSIGNALSComponent_Swig ${_link_LIBRARIES}) +INSTALL(TARGETS _libSIGNALSComponent_Swig DESTINATION ${SALOME_INSTALL_LIBS}) + +SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS}) diff --git a/src/SIGNALSComponent_Swig/Makefile.am b/src/SIGNALSComponent_Swig/Makefile.am deleted file mode 100644 index dcc83ae..0000000 --- a/src/SIGNALSComponent_Swig/Makefile.am +++ /dev/null @@ -1,89 +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 -# - -# SuperVisionTest SIGNALSComponent : example of component that devides two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# =============================================================== -# Swig targets -# =============================================================== -# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) -# -# Step 1: build the wrapping source files with swig -# -# libSALOME_LifeCycleCORBA.i -- swig --> swig_wrap.cpp -# libSALOME_Swig.py -# -# Step 2: build the dynamic library from cpp built source files and -# dependant libraries. -# -# swig_wrap.cpp -- gcc --> swig_wrap.o |-- link --> _libSALOME_Swig.la -# + | -# dependant libs | -# -# The file libSIGNALSComponent_Swig.py will be installed in -# /lib/python/site-package/salome. -# The library will be installed in the same place. -# - -# this option puts it to dist -#BUILT_SOURCES = swig_wrap.cpp - -SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -SWIG_SOURCES = libSIGNALSComponent_Swig.i - -# Libraries targets -lib_LTLIBRARIES = _libSIGNALSComponent_Swig.la -_libSIGNALSComponent_Swig_la_SOURCES = $(SWIG_SOURCES) -nodist__libSIGNALSComponent_Swig_la_SOURCES = swig_wrap.cpp -nodist_salomescript_DATA = libSIGNALSComponent_Swig.py - -EXTRA_DIST += $(SWIG_SOURCES) - -libSIGNALSComponent_Swig.py: swig_wrap.cpp - -_libSIGNALSComponent_Swig_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../SIGNALSComponent \ - -I$(top_builddir)/idl - -_libSIGNALSComponent_Swig_la_LDFLAGS = -module -_libSIGNALSComponent_Swig_la_LIBADD = \ - ../SIGNALSComponent/libSIGNALSComponentEngine.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification - -swig_wrap.cpp : $(SWIG_SOURCES) - $(SWIG) $(SWIG_FLAGS) -o $@ $< - -CLEANFILES = swig_wrap.cpp libSIGNALSComponent_Swig.py diff --git a/src/SubComponent/CMakeLists.txt b/src/SubComponent/CMakeLists.txt new file mode 100644 index 0000000..f3f921b --- /dev/null +++ b/src/SubComponent/CMakeLists.txt @@ -0,0 +1,67 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(SubComponentEngine_HEADERS + SubComponent.hxx +) + +# --- sources --- + +# sources / static +SET(SubComponentEngine_SOURCES + SubComponent.cxx +) + +# --- rules --- + +ADD_LIBRARY(SubComponentEngine ${SubComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(SubComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS SubComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SubComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SubComponent/Makefile.am b/src/SubComponent/Makefile.am deleted file mode 100755 index 78b815d..0000000 --- a/src/SubComponent/Makefile.am +++ /dev/null @@ -1,54 +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 -# - -# SuperVisionTest SubComponent : example of component that sunstracts one number from another -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SubComponent.hxx - -# Libraries targets -lib_LTLIBRARIES = libSubComponentEngine.la -dist_libSubComponentEngine_la_SOURCES = \ - SubComponent.cxx - -libSubComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libSubComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification diff --git a/src/SyrComponent/CMakeLists.txt b/src/SyrComponent/CMakeLists.txt new file mode 100644 index 0000000..1f574d8 --- /dev/null +++ b/src/SyrComponent/CMakeLists.txt @@ -0,0 +1,92 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/AddComponent + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_SALOMEBasics} + ${KERNEL_ResourcesManager} + ${KERNEL_SalomeIDLKERNEL} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(SyrComponentEngine_HEADERS + SyrComponent_Impl.hxx +) + +# --- sources --- + +# sources / static +SET(SyrComponentEngine_SOURCES + SyrComponent_Impl.cxx +) + +# bin programs +SET(SyrComponent_CheckOfUndefined_SOURCES + SyrComponent_CheckOfUndefined.cxx +) + +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + COMPONENT_shared_modules.py +) + +# --- rules --- + +ADD_LIBRARY(SyrComponentEngine ${SyrComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(SyrComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS SyrComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(SyrComponent_CheckOfUndefined ${SyrComponent_CheckOfUndefined_SOURCES}) +TARGET_LINK_LIBRARIES(SyrComponent_CheckOfUndefined ${_link_LIBRARIES}) +INSTALL(TARGETS SyrComponent_CheckOfUndefined EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${SyrComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/shared_modules) diff --git a/src/SyrComponent/Makefile.am b/src/SyrComponent/Makefile.am deleted file mode 100755 index abe8371..0000000 --- a/src/SyrComponent/Makefile.am +++ /dev/null @@ -1,77 +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 -# - -# SuperVisionTest SyrComponent : example of component performing some mathinatical operations -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SyrComponent_Impl.hxx - -# Libraries targets -lib_LTLIBRARIES = libSyrComponentEngine.la -dist_libSyrComponentEngine_la_SOURCES = \ - SyrComponent_Impl.cxx - -# Executables targets -bin_PROGRAMS = SyrComponent_CheckOfUndefined -dist_SyrComponent_CheckOfUndefined_SOURCES = \ - SyrComponent_CheckOfUndefined.cxx - -${bin_PROGRAMS}: ${lib_LTLIBRARIES} - -libSyrComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../AddComponent \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libSyrComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSALOMELocalTrace \ - -lSalomeResourcesManager \ - -lSALOMEBasics \ - -lSalomeIDLKernel \ - -lSalomeHDFPersist \ - -lResourcesManager - -SyrComponent_CheckOfUndefined_CPPFLAGS = \ - $(libSyrComponentEngine_la_CPPFLAGS) - -SyrComponent_CheckOfUndefined_LDFLAGS = \ - ./libSyrComponentEngine.la \ - $(libSyrComponentEngine_la_LDFLAGS) - -sharedpkgpython_PYTHON = \ - COMPONENT_shared_modules.py diff --git a/src/SyrControlComponent/CMakeLists.txt b/src/SyrControlComponent/CMakeLists.txt new file mode 100644 index 0000000..b8b20b1 --- /dev/null +++ b/src/SyrControlComponent/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 +# + +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + SyrControlComponent.py +) + +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON}) \ No newline at end of file diff --git a/src/SyrControlComponent/Makefile.am b/src/SyrControlComponent/Makefile.am deleted file mode 100644 index 0e5c79b..0000000 --- a/src/SyrControlComponent/Makefile.am +++ /dev/null @@ -1,28 +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.in -# Author : Jean Rahuel -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomescript_DATA = \ - SyrControlComponent.py diff --git a/src/TestFunctions/CMakeLists.txt b/src/TestFunctions/CMakeLists.txt new file mode 100644 index 0000000..512a9de --- /dev/null +++ b/src/TestFunctions/CMakeLists.txt @@ -0,0 +1,106 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/AddComponent + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_SALOMEBasics} + ${KERNEL_ResourcesManager} + ${KERNEL_SalomeIDLKERNEL} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(DynInvoke_HEADERS + DynInvoke.hxx +) + +# --- sources --- + +# sources / static +SET(DynInvoke_SOURCES + DynInvoke.cxx +) + +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + TestFunctions.py +) + + +# --- rules --- + +ADD_LIBRARY(DynInvoke ${DynInvoke_SOURCES}) +TARGET_LINK_LIBRARIES(DynInvoke ${_link_LIBRARIES} ) +INSTALL(TARGETS DynInvoke EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(TestFunctions TestFunctions.cxx) +TARGET_LINK_LIBRARIES(TestFunctions ${_link_LIBRARIES} DynInvoke) + +ADD_EXECUTABLE(TestFunctionsMemory TestFunctionsMemory.cxx) +TARGET_LINK_LIBRARIES(TestFunctionsMemory ${_link_LIBRARIES} DynInvoke) + +ADD_EXECUTABLE(TestFunctionsMemory1 TestFunctionsMemory1.cxx) +TARGET_LINK_LIBRARIES(TestFunctionsMemory1 ${_link_LIBRARIES} DynInvoke) + +ADD_EXECUTABLE(TestFunctionsMemory2 TestFunctionsMemory2.cxx) +TARGET_LINK_LIBRARIES(TestFunctionsMemory2 ${_link_LIBRARIES} DynInvoke) + +ADD_EXECUTABLE(TestFunctionsMemory3 TestFunctionsMemory3.cxx) +TARGET_LINK_LIBRARIES(TestFunctionsMemory3 ${_link_LIBRARIES} DynInvoke) + +ADD_EXECUTABLE(TestFunctionsMemory4 TestFunctionsMemory4.cxx) +TARGET_LINK_LIBRARIES(TestFunctionsMemory4 ${_link_LIBRARIES} DynInvoke) + +INSTALL(TARGETS TestFunctions TestFunctionsMemory TestFunctionsMemory1 TestFunctionsMemory2 TestFunctionsMemory3 + TestFunctionsMemory4 EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${DynInvoke_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON}) \ No newline at end of file diff --git a/src/TestFunctions/Makefile.am b/src/TestFunctions/Makefile.am deleted file mode 100644 index 638f6b6..0000000 --- a/src/TestFunctions/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 -# - -# SuperVisionTest TestFunctions : example of component that adds two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libDynInvoke.la -dist_libDynInvoke_la_SOURCES = \ - DynInvoke.hxx DynInvoke.cxx - -bin_PROGRAMS = \ - TestFunctions \ - TestFunctionsMemory \ - TestFunctionsMemory1 \ - TestFunctionsMemory2 \ - TestFunctionsMemory3 \ - TestFunctionsMemory4 - -libDynInvoke_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../AddComponent \ - -I$(top_builddir)/idl - -libDynInvoke_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSALOMELocalTrace \ - -lSalomeLifeCycleCORBA \ - -lSalomeResourcesManager \ - -lSALOMEBasics \ - -lSalomeIDLKernel \ - -lSalomeHDFPersist \ - -lResourcesManager - -TestFunctions_SOURCES = TestFunctions.cxx -TestFunctionsMemory_SOURCES = TestFunctionsMemory.cxx -TestFunctionsMemory1_SOURCES = TestFunctionsMemory1.cxx -TestFunctionsMemory2_SOURCES = TestFunctionsMemory2.cxx -TestFunctionsMemory3_SOURCES = TestFunctionsMemory3.cxx -TestFunctionsMemory4_SOURCES = TestFunctionsMemory4.cxx - -AM_CPPFLAGS += \ - $(libDynInvoke_la_CPPFLAGS) - -LDADD = \ - ./libDynInvoke.la \ - $(libDynInvoke_la_LDFLAGS) - -AM_LDFLAGS = \ - $(CORBA_LIBS) - -dist_salomescript_SCRIPTS = TestFunctions.py diff --git a/src/TypesCheck/CMakeLists.txt b/src/TypesCheck/CMakeLists.txt new file mode 100644 index 0000000..da8db47 --- /dev/null +++ b/src/TypesCheck/CMakeLists.txt @@ -0,0 +1,83 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/AddComponent + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_SALOMEBasics} + ${KERNEL_ResourcesManager} + ${KERNEL_SalomeIDLKERNEL} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(TypesCheckEngine_HEADERS + TypesCheck_Impl.hxx +) + +# --- sources --- + +# sources / static +SET(TypesCheckEngine_SOURCES + TypesCheck_Impl.cxx +) + +# bin programs +SET(TypesCheck_CheckOfUndefined_SOURCES + TypesCheck_CheckOfUndefined.cxx +) + +# --- rules --- + +ADD_LIBRARY(TypesCheckEngine ${TypesCheckEngine_SOURCES}) +TARGET_LINK_LIBRARIES(TypesCheckEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS TypesCheckEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(TypesCheck_CheckOfUndefined ${TypesCheck_CheckOfUndefined_SOURCES}) +TARGET_LINK_LIBRARIES(TypesCheck_CheckOfUndefined ${_link_LIBRARIES}) +INSTALL(TARGETS TypesCheck_CheckOfUndefined EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${TypesCheckEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/TypesCheck/Makefile.am b/src/TypesCheck/Makefile.am deleted file mode 100755 index fa415d5..0000000 --- a/src/TypesCheck/Makefile.am +++ /dev/null @@ -1,74 +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 -# - -# SuperVisionTest AddComponent : example of component that adds two numbers -# File : Makefile.in -# Author : , CEA -# Module : SuperVisionTest -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - TypesCheck_Impl.hxx - -# Libraries targets -lib_LTLIBRARIES = libTypesCheckEngine.la -dist_libTypesCheckEngine_la_SOURCES = \ - TypesCheck_Impl.cxx - -bin_PROGRAMS = TypesCheck_CheckOfUndefined -dist_TypesCheck_CheckOfUndefined_SOURCES = \ - TypesCheck_CheckOfUndefined.cxx - -${bin_PROGRAMS}: ${lib_LTLIBRARIES} - -libTypesCheckEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../AddComponent \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libTypesCheckEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification \ - -lSALOMELocalTrace \ - -lSalomeResourcesManager \ - -lSALOMEBasics \ - -lSalomeIDLKernel \ - -lSalomeHDFPersist \ - -lResourcesManager - -TypesCheck_CheckOfUndefined_CPPFLAGS = \ - $(libTypesCheckEngine_la_CPPFLAGS) - -TypesCheck_CheckOfUndefined_LDFLAGS = \ - ./libTypesCheckEngine.la \ - $(libTypesCheckEngine_la_LDFLAGS) \ - $(CORBA_LIBS) diff --git a/src/UndefinedSymbolComponent/CMakeLists.txt b/src/UndefinedSymbolComponent/CMakeLists.txt new file mode 100644 index 0000000..a4afa3c --- /dev/null +++ b/src/UndefinedSymbolComponent/CMakeLists.txt @@ -0,0 +1,67 @@ +# 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( + ${PYTHON_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_Registry} + ${KERNEL_SalomeNotification} + SalomeIDLCOMPONENT +) + +# --- headers --- + +# header files / no moc processing +SET(UndefinedSymbolComponentEngine_HEADERS + UndefinedSymbolComponent.hxx +) + +# --- sources --- + +# sources / static +SET(UndefinedSymbolComponentEngine_SOURCES + UndefinedSymbolComponent.cxx +) + +# --- rules --- + +ADD_LIBRARY(UndefinedSymbolComponentEngine ${UndefinedSymbolComponentEngine_SOURCES}) +TARGET_LINK_LIBRARIES(UndefinedSymbolComponentEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS UndefinedSymbolComponentEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${UndefinedSymbolComponentEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/UndefinedSymbolComponent/Makefile.am b/src/UndefinedSymbolComponent/Makefile.am deleted file mode 100755 index b8b8bbd..0000000 --- a/src/UndefinedSymbolComponent/Makefile.am +++ /dev/null @@ -1,54 +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 -# - -# SuperVisionTest UndefinedSymbolComponent : example of component that devides two numbers -# File : Makefile.in -# Author : , CEA -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest -# $Header: -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - UndefinedSymbolComponent.hxx - -# Libraries targets -lib_LTLIBRARIES = libUndefinedSymbolComponentEngine.la -dist_libUndefinedSymbolComponentEngine_la_SOURCES = \ - UndefinedSymbolComponent.cxx - -libUndefinedSymbolComponentEngine_la_CPPFLAGS = \ - $(PYTHON_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libUndefinedSymbolComponentEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLCOMPONENT.la \ - $(KERNEL_LDFLAGS) \ - -lSalomeGenericObj \ - -lSalomeContainer \ - -lSalomeNS \ - -lOpUtil \ - -lRegistry \ - -lSalomeNotification