STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
ENDIF()
+# Platform setup (from CONFIGURATION)
+# ==============
+INCLUDE(SalomeSetupPlatform)
+# Always build libraries as shared objects:
+SET(BUILD_SHARED_LIBS TRUE)
+
# Find KERNEL
# ===========
SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
INCLUDE(SalomeMacros)
FIND_PACKAGE(SalomeKERNEL REQUIRED)
KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA
+ ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
+ INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
ELSE(EXISTS ${KERNEL_ROOT_DIR})
MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
ENDIF(EXISTS ${KERNEL_ROOT_DIR})
-# Platform setup
-# ==============
-INCLUDE(SalomeSetupPlatform) # From KERNEL
-# Always build libraries as shared objects:
-SET(BUILD_SHARED_LIBS TRUE)
-# Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
-
# User options
# ============
OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
-#OPTION(SALOME_BUILD_DOC "Generate SALOME SHAPERSTUDY documentation" ON)
+# TODO: documentation
+# OPTION(SALOME_BUILD_DOC "Generate SALOME SHAPERSTUDY documentation" ON)
IF(SALOME_BUILD_TESTS)
ENABLE_TESTING()
ENDIF()
+# TODO: documentation
# IF(SALOME_BUILD_DOC)
# FIND_PACKAGE(SalomeDoxygen)
+# FIND_PACKAGE(SalomeGraphviz)
+# FIND_PACKAGE(SalomeSphinx)
# SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
+# SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC)
+# SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
# ENDIF()
##
FIND_PACKAGE(SalomeOmniORB REQUIRED)
FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
FIND_PACKAGE(SalomeSWIG REQUIRED)
-FIND_PACKAGE(SalomeQt5 REQUIRED)
-
-# Find GUI
-# ===========
-# SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
-# IF(EXISTS ${GUI_ROOT_DIR})
-# LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
-# FIND_PACKAGE(SalomeGUI REQUIRED)
-# ADD_DEFINITIONS(${GUI_DEFINITIONS})
-# INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
-# ELSE(EXISTS ${GUI_ROOT_DIR})
-# MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
-# ENDIF(EXISTS ${GUI_ROOT_DIR})
-
-##
-## From GUI:
-##
-# Qt
-#FIND_PACKAGE(SalomeQt5 REQUIRED)
# Find GEOM
# ===========
# Find SHAPER
# ===========
+# TODO: Change SHAPER detection procedure, as soon as config file's support is implemented in SHAPER
SET(SHAPER_ROOT_DIR $ENV{SHAPER_ROOT_DIR} CACHE PATH "Path to the Salome SHAPER")
IF(EXISTS ${SHAPER_ROOT_DIR})
SET_AND_CHECK(SHAPER_INCLUDE_DIRS "${SHAPER_ROOT_DIR}/include/salome")
ENDIF(EXISTS ${SHAPER_ROOT_DIR})
# Detection summary:
-SALOME_PACKAGE_REPORT_AND_CHECK()
+# TODO: Uncomment in case if any products are used optionally
+# SALOME_PACKAGE_REPORT_AND_CHECK()
# Directories
# (default values taken from KERNEL)
# ===========
-SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries")
-SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs")
-SET(SALOME_INSTALL_IDLS "${SALOME_INSTALL_IDLS}" CACHE PATH "Install path: SALOME IDL files")
-SET(SALOME_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "Install path: SALOME headers")
-SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH
- "Install path: SALOME scripts")
-SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH
- "Install path: SALOME script data")
-SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH
- "Install path: SALOME Python scripts")
-SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH
- "Install path: SALOME application skeleton - scripts")
-SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH
- "Install path: SALOME application skeleton - Python")
-#SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff")
-#SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH
-# "Install path: SALOME Python shared modules")
-SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH "Install path: 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")
-
+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_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH "Install path: SALOME CMake files")
+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 SHAPERSTUDY:
SET(SALOME_SHAPERSTUDY_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/shaperstudy" CACHE PATH
- "Install path: SALOME SHAPERSTUDY specific data")
+ "Install path: SHAPERSTUDY resources")
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_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_DOC)
MARK_AS_ADVANCED(SALOME_SHAPERSTUDY_INSTALL_RES_DATA)
# Accumulate environment variables for SHAPERSTUDY module
SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
- ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
+ ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_SCRIPT_PYTHON})
SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
# Sources
# ========
ADD_SUBDIRECTORY(idl)
-ADD_SUBDIRECTORY(adm_local)
ADD_SUBDIRECTORY(resources)
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(bin)
# 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
- SalomeIDLSHAPERSTUDY
+ SalomeIDLSHAPERSTUDY StudyData
)
# Add all targets to the build-tree export set
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(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
+SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
+SET(GEOM_ROOT_DIR "${GEOM_ROOT_DIR}")
+SET(SHAPER_ROOT_DIR "${SHAPER_ROOT_DIR}")
SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
# Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-# SALOME_CONFIGURE_PREPARE() #For use in the future
+# TODO: Uncomment if any 1st level pre-requisites built with CMake are used
+# SALOME_CONFIGURE_PREPARE()
CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
- GUI_ROOT_DIR)
+ KERNEL_ROOT_DIR GEOM_ROOT_DIR SHAPER_ROOT_DIR)
WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
VERSION ${${PROJECT_NAME_UC}_VERSION}
-# - 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-2019 CEA/DEN, EDF R&D, OPEN CASCADE
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+# - 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
+#
+
### 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 SalomeIDLSHAPERSTUDY AND NOT @PROJECT_NAME@_BINARY_DIR)
+ INCLUDE("${SHAPERSTUDY_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeSHAPERSTUDYTargets.cmake")
+ENDIF()
# Package root dir:
SET_AND_CHECK(SHAPERSTUDY_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
# Include directories
SET_AND_CHECK(SHAPERSTUDY_INCLUDE_DIRS "${SHAPERSTUDY_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@")
SET(SHAPERSTUDY_INCLUDE_DIRS "${SHAPERSTUDY_INCLUDE_DIRS};@_SalomeSHAPERSTUDY_EXTRA_HEADERS@")
-SET(SHAPERSTUDY_DEFINITIONS "@GUI_DEFINITIONS@")
+SET(SHAPERSTUDY_DEFINITIONS "@GEOM_DEFINITIONS@")
# Package specific environment variables
@_SalomeSHAPERSTUDY_EXTRA_ENV_FULL@
-# 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 SalomeIDLSHAPERSTUDY AND NOT @PROJECT_NAME@_BINARY_DIR)
- INCLUDE("${SHAPERSTUDY_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeSHAPERSTUDYTargets.cmake")
-ENDIF()
-
#### Now the specificities
# Options exported by the package:
SET(SALOME_SHAPERSTUDY_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_SHAPERSTUDY_BUILD_DOC @SALOME_BUILD_DOC@)
+# TODO: documentation
+# SET(SALOME_SHAPERSTUDY_BUILD_DOC @SALOME_BUILD_DOC@)
# Level 1 prerequisites:
-SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
+SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_GEOM_ROOT_DIR@")
+SET_AND_CHECK(SHAPER_ROOT_DIR_EXP "@PACKAGE_SHAPER_ROOT_DIR@")
# For all prerequisites, load the corresponding targets if the package was used
# in CONFIG mode. This ensures dependent projects link correctly
ENDFOREACH()
ENDIF()
-# 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 GUI targets if they were not already loaded:
-IF(NOT (TARGET Event))
- INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeGUITargets.cmake")
-ENDIF()
+# Include GEOM targets if they were not already loaded:
+IF(NOT (TARGET GEOMbasic))
+ INCLUDE("${GEOM_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGEOMTargets.cmake")
+ENDIF(NOT (TARGET GEOMbasic))
+# TODO: Include SHAPER targets, as soon as config file's support is implemented in SHAPER
# Exposed SHAPERSTUDY targets:
-SET(SHAPERSTUDY_SalomeIDLSHAPERSTUDY SalomeIDLSHAPERSTUDY)
\ No newline at end of file
+SET(SHAPERSTUDY_SalomeIDLSHAPERSTUDY SalomeIDLSHAPERSTUDY)
+SET(SHAPERSTUDY_StudyData StudyData)
\ No newline at end of file
+++ /dev/null
-# Copyright (C) 2007-2019 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, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ADD_SUBDIRECTORY(unix)
-ADD_SUBDIRECTORY(cmake_files)
+++ /dev/null
-# Copyright (C) 2012-2019 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# ===============================================================
-# Files to be installed
-# ===============================================================
-
-# These files are data, module or lib files
-SET(_adm_data
- FindSalomeSHAPERSTUDY.cmake
-)
-INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})
+++ /dev/null
-# Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-IF(NOT SalomePYHELLO_FIND_QUIETLY)
- MESSAGE(STATUS "Looking for Salome PYHELLO ...")
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${PYHELLO_ROOT_DIR}")
-SALOME_FIND_PACKAGE(SalomePYHELLO SalomePYHELLO CONFIG)
-
-IF(NOT SalomePYHELLO_FIND_QUIETLY)
- MESSAGE(STATUS "Found Salome PYHELLO: ${PYHELLO_ROOT_DIR}")
-ENDIF()
-
-FOREACH(_res ${SalomePYHELLO_EXTRA_ENV})
- SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomePYHELLO_EXTRA_ENV_${_res}}")
-ENDFOREACH()
+++ /dev/null
-# Copyright (C) 2012-2019 CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ADD_SUBDIRECTORY(config_files)
+++ /dev/null
-# Copyright (C) 2007-2019 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, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-SET(_m4_data
- check_SHAPERSTUDY.m4
-)
-
-INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files)
+++ /dev/null
-dnl Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE
-dnl
-dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-dnl
-
-# Check availability of SHAPERSTUDY binary distribution
-#
-# Author : Marc Tajchman (CEA, 2002)
-#------------------------------------------------------------
-
-AC_DEFUN([CHECK_SHAPERSTUDY],[
-
-AC_CHECKING(for SHAPERSTUDY)
-
-SHAPERSTUDY_ok=no
-
-AC_ARG_WITH(SHAPERSTUDY,
- --with-shaperstudy=DIR root directory path of SHAPERSTUDY installation,
- SHAPERSTUDY_DIR="$withval",SHAPERSTUDY_DIR="")
-
-if test "x$SHAPERSTUDY_DIR" = "x" ; then
-
-# no --with-py-hello option used
-
- if test "x$SHAPERSTUDY_ROOT_DIR" != "x" ; then
-
- # SHAPERSTUDY_ROOT_DIR environment variable defined
- SHAPERSTUDY_DIR=$SHAPERSTUDY_ROOT_DIR
-
- else
-
- # search SHAPERSTUDY binaries in PATH variable
- AC_PATH_PROG(TEMP, SHAPERSTUDYGUI.py)
- if test "x$TEMP" != "x" ; then
- SHAPERSTUDY_BIN_DIR=`dirname $TEMP`
- SHAPERSTUDY_DIR=`dirname $SHAPERSTUDY_BIN_DIR`
- fi
-
- fi
-#
-fi
-
-if test -f ${SHAPERSTUDY_DIR}/bin/salome/SHAPERSTUDY.py ; then
- SHAPERSTUDY_ok=yes
- AC_MSG_RESULT(Using SHAPERSTUDY distribution in ${SHAPERSTUDY_DIR})
-
- if test "x$SHAPERSTUDY_ROOT_DIR" == "x" ; then
- SHAPERSTUDY_ROOT_DIR=${SHAPERSTUDY_DIR}
- fi
- AC_SUBST(SHAPERSTUDY_ROOT_DIR)
-else
- AC_MSG_WARN("Cannot find compiled SHAPERSTUDY distribution")
-fi
-
-AC_MSG_RESULT(for SHAPERSTUDY: $SHAPERSTUDY_ok)
-
-])dnl
-
#
SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
-#SALOME_CONFIGURE_FILE(runSHAPERSTUDY.in runSHAPERSTUDY INSTALL ${SALOME_INSTALL_BINS} EXEC_PERMS)
-
-# ===============================================================
-# Files to be installed
-# ===============================================================
-
-SET(_bin_scripts
-
-)
-
-SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseOmniORB) # Provided by KERNEL
+INCLUDE(UseOmniORB)
INCLUDE_DIRECTORIES(
${OMNIORB_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
- ${KERNEL_INCLUDE_DIRS}
)
SET(SalomeIDLSHAPERSTUDY_IDLSOURCES
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQtExt)
-
-
SET(SHAPERSTUDY_RESOURCES_FILES
compsolid.png
edge.png
wire.png
)
-SET(_ts_RESOURCES
- SHAPERSTUDY_images.ts
-)
-
-
-
INSTALL(FILES ${SHAPERSTUDY_RESOURCES_FILES} DESTINATION ${SALOME_SHAPERSTUDY_INSTALL_RES_DATA})
-QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SHAPERSTUDY_INSTALL_RES_DATA}")
SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SHAPERSTUDY_INSTALL_RES_DATA})
SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SHAPERSTUDYCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SHAPERSTUDYCatalog.xml INSTALL ${SALOME_SHAPERSTUDY_INSTALL_RES_DATA})
<?xml version='1.0' encoding='us-ascii' ?>
<!-- XML component catalog -->
<begin-catalog>
- <!-- Path prefix information -->
- <path-prefix-list></path-prefix-list>
- <!-- Types list -->
- <type-list></type-list>
- <!-- Component list -->
- <component-list>
- <component>
- <!-- Component identification -->
- <component-name>SHAPERSTUDY</component-name>
- <component-username>SHAPERSTUDY</component-username>
- <component-type>Data</component-type>
- <component-author>SALOME team</component-author>
- <component-version>@SALOMESHAPERSTUDY_VERSION@</component-version>
- <component-comment></component-comment>
- <component-impltype>1</component-impltype>
- <component-icone>SHAPERSTUDY.png</component-icone>
- <constraint></constraint>
- <!-- Component services list -->
- <component-interface-list>
- <component-interface-name>SHAPERSTUDY_Gen</component-interface-name>
- <component-interface-comment>unknown</component-interface-comment>
- <component-service-list>
- <!-- Component service: makeBanner -->
- <component-service>
- <service-name>makeBanner</service-name>
- <service-author>vsr</service-author>
- <service-version>@SALOMESHAPERSTUDY_VERSION@</service-version>
- <service-comment>unknown</service-comment>
- <service-by-default>0</service-by-default>
- <inParameter-list>
- <inParameter>
- <inParameter-name>name</inParameter-name>
- <inParameter-type>string</inParameter-type>
- <inParameter-comment>unknown</inParameter-comment>
- </inParameter>
- </inParameter-list>
- <outParameter-list>
- <outParameter>
- <outParameter-name>return</outParameter-name>
- <outParameter-type>string</outParameter-type>
- <outParameter-comment>unknown</outParameter-comment>
- </outParameter>
- </outParameter-list>
- <DataStream-list></DataStream-list>
- </component-service>
- <!-- Component service: createObject -->
- <component-service>
- <service-name>createObject</service-name>
- <service-author>vsr</service-author>
- <service-version>@SALOMESHAPERSTUDY_VERSION@</service-version>
- <service-comment>unknown</service-comment>
- <service-by-default>0</service-by-default>
- <inParameter-list>
- <inParameter>
- <inParameter-name>name</inParameter-name>
- <inParameter-type>string</inParameter-type>
- <inParameter-comment>unknown</inParameter-comment>
- </inParameter>
- </inParameter-list>
- <outParameter-list></outParameter-list>
- <DataStream-list></DataStream-list>
- </component-service>
- </component-service-list>
- </component-interface-list>
- </component>
- </component-list>
+ <!-- Path prefix information -->
+ <path-prefix-list />
+ <!-- Types -->
+ <type-list />
+ <!-- Components -->
+ <component-list>
+ <!-- SHAPERSTUDY component -->
+ <component>
+ <!-- General information -->
+ <component-name>SHAPERSTUDY</component-name>
+ <component-username>SHAPERSTUDY</component-username>
+ <component-type>GEOM</component-type>
+ <component-author>SALOME team</component-author>
+ <component-version>@SALOMESHAPERSTUDY_VERSION@</component-version>
+ <component-comment>CAD modeler</component-comment>
+ <component-impltype>1</component-impltype>
+ <component-icone>SHAPERSTUDY.png</component-icone>
+ <constraint></constraint>
+ <!-- Component interface -->
+ <component-interface-list>
+ <component-interface-name>SHAPERSTUDY_ORB/Gen</component-interface-name>
+ <component-interface-comment>SHAPERSTUDY module engine</component-interface-comment>
+ <!-- Services -->
+ <component-service-list />
+ </component-interface-list>
+ </component>
+ </component-list>
</begin-catalog>
+++ /dev/null
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fr_FR">
- <context>
- <name>@default</name>
- <message>
- <source>SHAPER_ICON_SOLID</source>
- <translation>solid.png</translation>
- </message>
- <message>
- <source>SHAPER_ICON_COMPSOLID</source>
- <translation>compsolid.png</translation>
- </message>
- <message>
- <source>SHAPER_ICON_FACE</source>
- <translation>face.png</translation>
- </message>
- <message>
- <source>SHAPER_ICON_EDGE</source>
- <translation>edge.png</translation>
- </message>
- <message>
- <source>SHAPER_ICON_SHELL</source>
- <translation>shell.png</translation>
- </message>
- <message>
- <source>SHAPER_ICON_VERTEX</source>
- <translation>vertex.png</translation>
- </message>
- <message>
- <source>SHAPER_ICON_WIRE</source>
- <translation>wire.png</translation>
- </message>
- </context>
-</TS>
ShapeType = {"AUTO":-1, "COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE":5, "EDGE":6, "VERTEX":7, "SHAPE":8, "FLAT":9}
- ShaperIcons = {GEOM.COMPOUND:"SHAPER_ICON_COMPSOLID",
- GEOM.COMPSOLID:"SHAPER_ICON_COMPSOLID",
- GEOM.SOLID:"SHAPER_ICON_SOLID",
- GEOM.SHELL:"SHAPER_ICON_SHELL",
- GEOM.FACE:"SHAPER_ICON_FACE",
- GEOM.WIRE:"SHAPER_ICON_WIRE",
- GEOM.EDGE:"SHAPER_ICON_EDGE",
- GEOM.VERTEX:"SHAPER_ICON_VERTEX",
- GEOM.SHAPE:"SHAPER_ICON_SOLID",
- GEOM.FLAT:"SHAPER_ICON_FACE"
+ ShaperIcons = {GEOM.COMPOUND:"compsolid.png",
+ GEOM.COMPSOLID:"compsolid.png",
+ GEOM.SOLID:"solid.png",
+ GEOM.SHELL:"shell.png",
+ GEOM.FACE:"face.png",
+ GEOM.WIRE:"wire.png",
+ GEOM.EDGE:"edge.png",
+ GEOM.VERTEX:"vertex.png",
+ GEOM.SHAPE:"solid.png",
+ GEOM.FLAT:"face.png"
}
def __init__ ( self, orb, poa, contID, containerName, instanceName, interfaceName ):
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${SHAPER_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${OpenCASCADE_INCLUDE_DIR}
- ${KERNEL_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/src/StudyData
)
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${KERNEL_INCLUDE_DIRS}
- ${GEOM_INCLUDE_DIRS}
${OpenCASCADE_INCLUDE_DIR}
- ${SHAPER_INCLUDE_DIRS}
)
# additional preprocessor / compiler flags
