From e7b562779c514770fa1702c436aef108ed4b6da5 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 10 Sep 2013 12:47:38 +0000 Subject: [PATCH 1/1] CMake porting --- CMakeLists.txt | 284 +++++++++ GEOM_version.h.in | 24 +- Makefile.am | 58 -- .../Makefile.am => CMakeLists.txt} | 12 +- adm_local/cmake_files/CMakeLists.txt | 30 + adm_local/cmake_files/FindOpenCV.cmake | 160 +++++ adm_local/cmake_files/FindSalomeOpenCV.cmake | 27 + .../cmake_files/SalomeGEOMConfig.cmake.in | 137 +++++ .../unix/{Makefile.am => CMakeLists.txt} | 6 +- .../unix/config_files/CMakeLists.txt | 19 +- adm_local/unix/make_common_starter.am | 100 ---- bin/{Makefile.am => CMakeLists.txt} | 24 +- build_cmake | 27 - build_cmake.bat | 20 - build_configure | 111 ---- clean_configure | 41 -- configure.ac | 546 ------------------ adm_local/Makefile.am => doc/CMakeLists.txt | 8 +- doc/docutils/CMakeLists.txt | 82 +++ doc/docutils/Makefile.am | 97 ---- doc/salome/CMakeLists.txt | 25 + doc/salome/Makefile.am | 39 -- doc/salome/examples/Makefile.am | 147 ----- .../salome/gui/CMakeLists.txt | 10 +- doc/salome/gui/GEOM/CMakeLists.txt | 4 + doc/salome/gui/GEOM/Makefile.am | 73 --- .../tui/CMakeLists.txt} | 25 +- doc/salome/tui/Makefile.am | 61 -- .../Makefile.am => idl/CMakeLists.txt | 38 +- idl/Makefile.am | 92 --- resources/CMakeLists.txt | 270 +++++++++ resources/Makefile.am | 270 --------- src/ARCHIMEDE/CMakeLists.txt | 53 ++ src/ARCHIMEDE/Makefile.am | 50 -- src/AdvancedEngine/CMakeLists.txt | 91 +++ src/AdvancedEngine/Makefile.am | 83 --- src/AdvancedGUI/CMakeLists.txt | 116 ++++ src/AdvancedGUI/Makefile.am | 101 ---- .../Makefile.am => BREPExport/CMakeLists.txt} | 47 +- src/BREPExport/Makefile.am | 43 -- .../Makefile.am => BREPImport/CMakeLists.txt} | 46 +- src/BREPImport/Makefile.am | 43 -- src/BasicGUI/CMakeLists.txt | 115 ++++ src/BasicGUI/Makefile.am | 114 ---- src/BlockFix/CMakeLists.txt | 73 +++ src/BlockFix/Makefile.am | 56 -- src/BlocksGUI/CMakeLists.txt | 107 ++++ src/BlocksGUI/Makefile.am | 85 --- src/BooleanGUI/CMakeLists.txt | 95 +++ src/BooleanGUI/Makefile.am | 72 --- src/BuildGUI/CMakeLists.txt | 115 ++++ src/BuildGUI/Makefile.am | 85 --- src/CMakeLists.txt | 59 ++ src/DisplayGUI/CMakeLists.txt | 73 +++ src/DisplayGUI/Makefile.am | 61 -- src/DlgRef/CMakeLists.txt | 126 ++++ src/DlgRef/Makefile.am | 116 ---- src/EntityGUI/CMakeLists.txt | 140 +++++ src/EntityGUI/Makefile.am | 129 ----- src/GEOM/CMakeLists.txt | 89 +++ src/GEOM/GEOM_Engine.cxx | 4 +- src/GEOM/Makefile.am | 80 --- src/GEOMAlgo/CMakeLists.txt | 197 +++++++ src/GEOMAlgo/Makefile.am | 188 ------ src/GEOMBase/CMakeLists.txt | 97 ++++ src/GEOMBase/Makefile.am | 80 --- src/GEOMClient/CMakeLists.txt | 61 ++ src/GEOMClient/Makefile.am | 57 -- src/GEOMFiltersSelection/CMakeLists.txt | 84 +++ src/GEOMFiltersSelection/Makefile.am | 71 --- src/GEOMGUI/CMakeLists.txt | 119 ++++ src/GEOMGUI/Makefile.am | 101 ---- src/GEOMImpl/CMakeLists.txt | 244 ++++++++ src/GEOMImpl/Makefile.am | 246 -------- src/GEOMToolsGUI/CMakeLists.txt | 110 ++++ src/GEOMToolsGUI/Makefile.am | 91 --- src/GEOMUtils/CMakeLists.txt | 57 ++ src/GEOMUtils/Makefile.am | 58 -- src/GEOM_I/CMakeLists.txt | 100 ++++ src/GEOM_I/Makefile.am | 98 ---- src/GEOM_I_Superv/CMakeLists.txt | 64 ++ src/GEOM_I_Superv/Makefile.am | 64 -- src/GEOM_PY/CMakeLists.txt | 32 + .../CMakeLists.txt} | 18 +- src/GEOM_PY/structelem/Makefile.am | 26 - src/GEOM_SWIG/CMakeLists.txt | 76 +++ src/GEOM_SWIG/Makefile.am | 76 --- src/GEOM_SWIG_WITHIHM/CMakeLists.txt | 86 +++ src/GEOM_SWIG_WITHIHM/Makefile.am | 85 --- src/GenerationGUI/CMakeLists.txt | 100 ++++ src/GenerationGUI/Makefile.am | 89 --- src/GroupGUI/CMakeLists.txt | 101 ++++ src/GroupGUI/Makefile.am | 75 --- src/IGESExport/CMakeLists.txt | 51 ++ .../Makefile.am => IGESImport/CMakeLists.txt} | 48 +- src/Makefile.am | 49 -- src/Material/CMakeLists.txt | 89 +++ src/Material/Makefile.am | 61 -- src/MeasureGUI/CMakeLists.txt | 151 +++++ src/MeasureGUI/Makefile.am | 126 ---- src/NMTDS/CMakeLists.txt | 77 +++ src/NMTDS/Makefile.am | 113 ---- src/NMTTools/CMakeLists.txt | 93 +++ src/NMTTools/Makefile.am | 98 ---- src/OBJECT/CMakeLists.txt | 110 ++++ src/OBJECT/Makefile.am | 93 --- src/OCC2VTK/CMakeLists.txt | 74 +++ src/OCC2VTK/Makefile.am | 51 -- src/OperationGUI/CMakeLists.txt | 120 ++++ src/OperationGUI/Makefile.am | 100 ---- src/PrimitiveGUI/CMakeLists.txt | 105 ++++ src/PrimitiveGUI/Makefile.am | 93 --- src/RepairGUI/CMakeLists.txt | 141 +++++ src/RepairGUI/Makefile.am | 129 ----- src/SKETCHER/CMakeLists.txt | 60 ++ src/SKETCHER/Makefile.am | 48 -- src/STEPExport/CMakeLists.txt | 51 ++ src/STEPImport/CMakeLists.txt | 51 ++ .../Makefile.am => STLExport/CMakeLists.txt} | 46 +- src/ShHealOper/CMakeLists.txt | 78 +++ src/ShHealOper/Makefile.am | 70 --- src/ShapeRecognition/CMakeLists.txt | 66 +++ src/ShapeRecognition/Makefile.am | 50 -- src/TransformationGUI/CMakeLists.txt | 119 ++++ src/TransformationGUI/Makefile.am | 104 ---- .../Makefile.am => VTKExport/CMakeLists.txt} | 49 +- 126 files changed, 5472 insertions(+), 5577 deletions(-) create mode 100755 CMakeLists.txt delete mode 100644 Makefile.am rename adm_local/{cmake_files/Makefile.am => CMakeLists.txt} (82%) mode change 100644 => 100755 create mode 100755 adm_local/cmake_files/CMakeLists.txt create mode 100644 adm_local/cmake_files/FindOpenCV.cmake create mode 100644 adm_local/cmake_files/FindSalomeOpenCV.cmake create mode 100644 adm_local/cmake_files/SalomeGEOMConfig.cmake.in rename adm_local/unix/{Makefile.am => CMakeLists.txt} (84%) mode change 100644 => 100755 rename doc/salome/gui/Makefile.am => adm_local/unix/config_files/CMakeLists.txt (75%) mode change 100644 => 100755 delete mode 100644 adm_local/unix/make_common_starter.am rename bin/{Makefile.am => CMakeLists.txt} (64%) mode change 100644 => 100755 delete mode 100755 build_cmake delete mode 100644 build_cmake.bat delete mode 100755 build_configure delete mode 100755 clean_configure delete mode 100644 configure.ac rename adm_local/Makefile.am => doc/CMakeLists.txt (82%) mode change 100644 => 100755 create mode 100755 doc/docutils/CMakeLists.txt delete mode 100644 doc/docutils/Makefile.am create mode 100755 doc/salome/CMakeLists.txt delete mode 100644 doc/salome/Makefile.am delete mode 100644 doc/salome/examples/Makefile.am rename adm_local/unix/config_files/Makefile.am => doc/salome/gui/CMakeLists.txt (85%) mode change 100644 => 100755 delete mode 100755 doc/salome/gui/GEOM/Makefile.am rename doc/{Makefile.am => salome/tui/CMakeLists.txt} (52%) mode change 100644 => 100755 delete mode 100644 doc/salome/tui/Makefile.am rename src/STLExport/Makefile.am => idl/CMakeLists.txt (57%) mode change 100644 => 100755 delete mode 100644 idl/Makefile.am create mode 100755 resources/CMakeLists.txt delete mode 100644 resources/Makefile.am create mode 100755 src/ARCHIMEDE/CMakeLists.txt delete mode 100644 src/ARCHIMEDE/Makefile.am create mode 100755 src/AdvancedEngine/CMakeLists.txt delete mode 100644 src/AdvancedEngine/Makefile.am create mode 100755 src/AdvancedGUI/CMakeLists.txt delete mode 100644 src/AdvancedGUI/Makefile.am rename src/{IGESExport/Makefile.am => BREPExport/CMakeLists.txt} (54%) mode change 100644 => 100755 delete mode 100644 src/BREPExport/Makefile.am rename src/{IGESImport/Makefile.am => BREPImport/CMakeLists.txt} (54%) mode change 100644 => 100755 delete mode 100644 src/BREPImport/Makefile.am create mode 100755 src/BasicGUI/CMakeLists.txt delete mode 100644 src/BasicGUI/Makefile.am create mode 100755 src/BlockFix/CMakeLists.txt delete mode 100644 src/BlockFix/Makefile.am create mode 100755 src/BlocksGUI/CMakeLists.txt delete mode 100644 src/BlocksGUI/Makefile.am create mode 100755 src/BooleanGUI/CMakeLists.txt delete mode 100644 src/BooleanGUI/Makefile.am create mode 100755 src/BuildGUI/CMakeLists.txt delete mode 100644 src/BuildGUI/Makefile.am create mode 100755 src/CMakeLists.txt create mode 100755 src/DisplayGUI/CMakeLists.txt delete mode 100644 src/DisplayGUI/Makefile.am create mode 100755 src/DlgRef/CMakeLists.txt delete mode 100644 src/DlgRef/Makefile.am create mode 100755 src/EntityGUI/CMakeLists.txt delete mode 100644 src/EntityGUI/Makefile.am create mode 100755 src/GEOM/CMakeLists.txt delete mode 100644 src/GEOM/Makefile.am create mode 100755 src/GEOMAlgo/CMakeLists.txt delete mode 100644 src/GEOMAlgo/Makefile.am create mode 100755 src/GEOMBase/CMakeLists.txt delete mode 100644 src/GEOMBase/Makefile.am create mode 100755 src/GEOMClient/CMakeLists.txt delete mode 100644 src/GEOMClient/Makefile.am create mode 100755 src/GEOMFiltersSelection/CMakeLists.txt delete mode 100644 src/GEOMFiltersSelection/Makefile.am create mode 100755 src/GEOMGUI/CMakeLists.txt delete mode 100644 src/GEOMGUI/Makefile.am create mode 100755 src/GEOMImpl/CMakeLists.txt delete mode 100644 src/GEOMImpl/Makefile.am create mode 100755 src/GEOMToolsGUI/CMakeLists.txt delete mode 100644 src/GEOMToolsGUI/Makefile.am create mode 100755 src/GEOMUtils/CMakeLists.txt delete mode 100644 src/GEOMUtils/Makefile.am create mode 100755 src/GEOM_I/CMakeLists.txt delete mode 100644 src/GEOM_I/Makefile.am create mode 100755 src/GEOM_I_Superv/CMakeLists.txt delete mode 100644 src/GEOM_I_Superv/Makefile.am create mode 100755 src/GEOM_PY/CMakeLists.txt rename src/GEOM_PY/{Makefile.am => structelem/CMakeLists.txt} (75%) mode change 100644 => 100755 delete mode 100644 src/GEOM_PY/structelem/Makefile.am create mode 100755 src/GEOM_SWIG/CMakeLists.txt delete mode 100644 src/GEOM_SWIG/Makefile.am create mode 100755 src/GEOM_SWIG_WITHIHM/CMakeLists.txt delete mode 100644 src/GEOM_SWIG_WITHIHM/Makefile.am create mode 100755 src/GenerationGUI/CMakeLists.txt delete mode 100644 src/GenerationGUI/Makefile.am create mode 100755 src/GroupGUI/CMakeLists.txt delete mode 100755 src/GroupGUI/Makefile.am create mode 100755 src/IGESExport/CMakeLists.txt rename src/{STEPExport/Makefile.am => IGESImport/CMakeLists.txt} (54%) mode change 100644 => 100755 delete mode 100644 src/Makefile.am create mode 100755 src/Material/CMakeLists.txt delete mode 100644 src/Material/Makefile.am create mode 100755 src/MeasureGUI/CMakeLists.txt delete mode 100644 src/MeasureGUI/Makefile.am create mode 100755 src/NMTDS/CMakeLists.txt delete mode 100644 src/NMTDS/Makefile.am create mode 100755 src/NMTTools/CMakeLists.txt delete mode 100644 src/NMTTools/Makefile.am create mode 100755 src/OBJECT/CMakeLists.txt delete mode 100644 src/OBJECT/Makefile.am create mode 100755 src/OCC2VTK/CMakeLists.txt delete mode 100644 src/OCC2VTK/Makefile.am create mode 100755 src/OperationGUI/CMakeLists.txt delete mode 100644 src/OperationGUI/Makefile.am create mode 100755 src/PrimitiveGUI/CMakeLists.txt delete mode 100644 src/PrimitiveGUI/Makefile.am create mode 100755 src/RepairGUI/CMakeLists.txt delete mode 100644 src/RepairGUI/Makefile.am create mode 100755 src/SKETCHER/CMakeLists.txt delete mode 100644 src/SKETCHER/Makefile.am create mode 100755 src/STEPExport/CMakeLists.txt create mode 100755 src/STEPImport/CMakeLists.txt rename src/{VTKExport/Makefile.am => STLExport/CMakeLists.txt} (55%) mode change 100644 => 100755 create mode 100755 src/ShHealOper/CMakeLists.txt delete mode 100644 src/ShHealOper/Makefile.am create mode 100755 src/ShapeRecognition/CMakeLists.txt delete mode 100644 src/ShapeRecognition/Makefile.am create mode 100755 src/TransformationGUI/CMakeLists.txt delete mode 100644 src/TransformationGUI/Makefile.am rename src/{STEPImport/Makefile.am => VTKExport/CMakeLists.txt} (52%) mode change 100644 => 100755 diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100755 index 000000000..ce07ae113 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,284 @@ +# 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(SalomeGEOM 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 3) +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 "GEOM module can't be built in Light mode (whiout 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 defined in KERNEL +# ============ +OPTION(SALOME_BUILD_DOC "Generate SALOME GEOM documentation" ${SALOME_BUILD_DOC}) +OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) + +# Advanced options: +OPTION(SALOME_GEOM_USE_GUI "Enable GUI" ON) +OPTION(SALOME_GEOM_USE_OPENCV "Enable shape recognition from picture" ON) + +MARK_AS_ADVANCED(SALOME_GEOM_USE_GUI SALOME_GEOM_USE_OPENCV) + +# Prerequisites +# ============= +# Find "big" prerequisites first - they reference themselves many others +# -> this can help finding the smaller prerequisites and detect conficts. +# In our case KERNEL has already loaded many prereq: + +## +## From KERNEL: +## + +# Various +FIND_PACKAGE(SalomePython REQUIRED) +FIND_PACKAGE(SalomePThread REQUIRED) +FIND_PACKAGE(SalomeSWIG REQUIRED) +FIND_PACKAGE(SalomeBoost REQUIRED) +FIND_PACKAGE(SalomeOmniORB REQUIRED) +FIND_PACKAGE(SalomeOmniORBPy REQUIRED) +#FIND_PACKAGE(SalomeLibXml2 REQUIRED) +#FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C) + +# Other KERNEL optionals: +# IF(SALOME_USE_MPI) +# FIND_PACKAGE(SalomeMPI REQUIRED) +# IF(HDF5_IS_PARALLEL) +# SALOME_ADD_MPI_TO_HDF5() +# ENDIF() +# ENDIF() +IF(SALOME_BUILD_TESTS) + ENABLE_TESTING() + FIND_PACKAGE(SalomeCppUnit) + SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(CppUnit SALOME_BUILD_TESTS) +ENDIF() +IF(SALOME_BUILD_DOC) + FIND_PACKAGE(SalomeDoxygen) + FIND_PACKAGE(SalomeGraphviz) + FIND_PACKAGE(SalomeSphinx) + SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Doxygen SALOME_BUILD_DOC) + SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Graphviz SALOME_BUILD_DOC) + SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(Sphinx SALOME_BUILD_DOC) +ENDIF() + +# Find GUI (optional) +IF(SALOME_GEOM_USE_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) + ELSE(EXISTS ${GUI_ROOT_DIR}) + MESSAGE(STATUS "GUI_ROOT_DIR is not well defined, GEOM will be built without GUI!!!") + ENDIF(EXISTS ${GUI_ROOT_DIR}) + SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(SalomeGUI SALOME_GEOM_USE_GUI) +ENDIF(SALOME_GEOM_USE_GUI) + +## +## Prerequisites From GUI: +## +IF(SALOME_GEOM_USE_GUI) + + # Qt4 + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) + + # Optional prerequisites for GUI + IF(SALOME_USE_GLVIEWER) + FIND_PACKAGE(SalomeOpenGL) + SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OpenGL SALOME_USE_GLVIEWER) + ENDIF() + IF(SALOME_USE_VTKVIEWER) + # Required components are listed in the FindSalomeVTK.cmake file: + FIND_PACKAGE(SalomeVTK 6.0) + SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(VTK SALOME_USE_VTKVIEWER) + ENDIF() + +ENDIF(SALOME_GEOM_USE_GUI) + +## +## GEOM specifics +## + +FIND_PACKAGE(SalomeCAS REQUIRED) + +IF(SALOME_GEOM_USE_GUI) + # OpenCV + FIND_PACKAGE(OpenCV) +ENDIF(SALOME_GEOM_USE_GUI) +SALOME_UPDATE_FLAG_AND_LOG_PACKAGE(OPENCV SALOME_GEOM_USE_OPENCV) + +# Detection summary: +SALOME_PACKAGE_REPORT() + + +# 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_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 "${SALOME_INSTALL_CMAKE}" CACHE PATH "Install path: SALOME CMake files") +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 GEOM: +SET(SALOME_GEOM_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/geom" CACHE PATH + "Install path: SALOME GEOM specific data") +SET(SALOME_GEOM_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/geom" CACHE PATH + "Install path: SALOME GEOM scripts") +SET(SALOME_GEOM_INSTALL_PLUGINS share/salome/plugins/geom CACHE PATH + "Install path: SALOME GEOM plugins") + +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 SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) +MARK_AS_ADVANCED(SALOME_GEOM_INSTALL_RES_DATA SALOME_GEOM_INSTALL_RES_SCRIPTS SALOME_GEOM_INSTALL_PLUGINS) +MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) + +# Sources +# ======== +ADD_SUBDIRECTORY(idl) + +ADD_SUBDIRECTORY(adm_local) +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(bin) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(doc) + +# Header configuration +# ==================== +SALOME_XVERSION(${PROJECT_NAME}) +SALOME_CONFIGURE_FILE(GEOM_version.h.in GEOM_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 + GEOMArchimede BREPExport BREPImport BlockFix GEOMbasic GEOMAlgo GEOMClient GEOMImpl + GEOMUtils GEOMEngine GEOM_SupervEngine IGESExport IGESImport NMTDS NMTTools GEOMSketcher + SalomeIDLGEOM STEPExport STEPImport STLExport ShHealOper +) +IF(SALOME_GEOM_USE_GUI) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + AdvancedGUI BasicGUI BlocksGUI BooleanGUI BuildGUI DisplayGUI DlgRef EntityGUI GEOMBase + GEOMFiltersSelection GEOM GEOMToolsGUI GenerationGUI GroupGUI Material MeasureGUI GEOMObject + OCC2VTK VTKExport OperationGUI PrimitiveGUI RepairGUI TransformationGUI + ) +ENDIF(SALOME_GEOM_USE_GUI) + +IF(SALOME_GEOM_USE_OPENCV) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + GEOMShapeRec + ) +ENDIF(SALOME_GEOM_USE_OPENCV) + +# 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(CAS_ROOT_DIR "${CAS_ROOT_DIR}") +SET(OPENCV_ROOT_DIR "${OPENCV_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}" + PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE CMAKE_INSTALL_PREFIX + KERNEL_ROOT_DIR GUI_ROOT_DIR CAS_ROOT_DIR OPENCV_ROOT_DIR) + +# - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?): +# Get the relative path of the include directory so +# we can register it in the generated configuration files: +#SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}") +#CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake.in +# ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake +# INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}" +# PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE CMAKE_INSTALL_PREFIX +# KERNEL_ROOT_DIR SIP_ROOT_DIR QT4_ROOT_DIR PYQT4_ROOT_DIR CAS_ROOT_DIR +# OPENGL_ROOT_DIR VTK_ROOT_DIR QWT_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}") + +# Install the export set for use with the install-tree +INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE}" + FILE ${PROJECT_NAME}Targets.cmake) diff --git a/GEOM_version.h.in b/GEOM_version.h.in index 9d6a2951c..aa1895c02 100644 --- a/GEOM_version.h.in +++ b/GEOM_version.h.in @@ -31,8 +31,26 @@ GEOM_VERSION is (major << 16) + (minor << 8) + patch. */ -#define GEOM_VERSION_STR "@VERSION@" -#define GEOM_VERSION @XVERSION@ -#define GEOM_DEVELOPMENT @VERSION_DEV@ +/* #define GEOM_VERSION_STR "@VERSION@" */ +/* #define GEOM_VERSION @XVERSION@ */ +/* #define GEOM_DEVELOPMENT @VERSION_DEV@ */ + +/*! + Specify version of SALOME GEOM module, as follows + + GEOM_VERSION_MAJOR : (integer) number identifying major version + GEOM_VERSION_MINOR : (integer) number identifying minor version + GEOM_VERSION_MAINTENANCE : (integer) number identifying maintenance version + GEOM_VERSION_STR : (string) complete version number "major.minor.maintenance" + GEOM_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + GEOM_DEVELOPMENT : (integer) indicates development version when set to 1 +*/ + +#define GEOM_VERSION_MAJOR @SALOMEGEOM_MAJOR_VERSION@ +#define GEOM_VERSION_MINOR @SALOMEGEOM_MINOR_VERSION@ +#define GEOM_VERSION_MAINTENANCE @SALOMEGEOM_PATCH_VERSION@ +#define GEOM_VERSION_STR "@SALOMEGEOM_VERSION@" +#define GEOM_VERSION @SALOMEGEOM_XVERSION@ +#define GEOM_DEVELOPMENT @SALOMEGEOM_VERSION_DEV@ #endif // __GEOM_VERSION_H__ diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 5f690493b..000000000 --- a/Makefile.am +++ /dev/null @@ -1,58 +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 -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if GEOM_ENABLE_GUI - ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files -else !GEOM_ENABLE_GUI - ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files -endif - -SUBDIRS = idl adm_local resources src bin doc - -DIST_SUBDIRS = idl adm_local resources src bin doc - -DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool adm_local/unix/config_files/config.guess adm_local/unix/config_files/config.sub adm_local/unix/config_files/depcomp adm_local/unix/config_files/install-sh adm_local/unix/config_files/libtool.m4 adm_local/unix/config_files/ltmain.sh adm_local/unix/config_files/ltoptions.m4 adm_local/unix/config_files/ltsugar.m4 adm_local/unix/config_files/ltversion.m4 adm_local/unix/config_files/lt~obsolete.m4 adm_local/unix/config_files/missing adm_local/unix/config_files/py-compile - -salomeinclude_DATA = GEOM_version.h - -EXTRA_DIST += \ - build_configure \ - clean_configure \ - LICENCE - -dist-hook: - rm -rf `find $(distdir) -name CVS` - -usr_docs: - (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs: usr_docs - -dev_docs: - (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/CMakeLists.txt old mode 100644 new mode 100755 similarity index 82% rename from adm_local/cmake_files/Makefile.am rename to adm_local/CMakeLists.txt index 7d044ddf7..84d97c22e --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/CMakeLists.txt @@ -1,5 +1,8 @@ # 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 @@ -17,10 +20,5 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -admlocal_cmakedir = $(admlocaldir)/cmake_files - -dist_admlocal_cmake_DATA = \ -FindGEOM.cmake - +ADD_SUBDIRECTORY(unix) +ADD_SUBDIRECTORY(cmake_files) diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt new file mode 100755 index 000000000..1134632aa --- /dev/null +++ b/adm_local/cmake_files/CMakeLists.txt @@ -0,0 +1,30 @@ +# 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 + FindOpenCV.cmake + FindSalomeOpenCV.cmake + FindGEOM.cmake +) +INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindOpenCV.cmake b/adm_local/cmake_files/FindOpenCV.cmake new file mode 100644 index 000000000..8d0b1419c --- /dev/null +++ b/adm_local/cmake_files/FindOpenCV.cmake @@ -0,0 +1,160 @@ +########################################################### +# Find OpenCV Library +# See http://sourceforge.net/projects/opencvlibrary/ +#---------------------------------------------------------- +# +## 1: Setup: +# The following variables are optionally searched for defaults +# OpenCV_DIR: Base directory of OpenCv tree to use. +# +## 2: Variable +# The following are set after configuration is done: +# +# OpenCV_FOUND +# OpenCV_LIBS +# OpenCV_INCLUDE_DIR +# OpenCV_VERSION (OpenCV_VERSION_MAJOR, OpenCV_VERSION_MINOR, OpenCV_VERSION_PATCH) +# +# +# Deprecated variable are used to maintain backward compatibility with +# the script of Jan Woetzel (2006/09): www.mip.informatik.uni-kiel.de/~jw +# OpenCV_INCLUDE_DIRS +# OpenCV_LIBRARIES +# OpenCV_LINK_DIRECTORIES +# +## 3: Version +# +# 2010/04/07 Benoit Rat, Correct a bug when OpenCVConfig.cmake is not found. +# 2010/03/24 Benoit Rat, Add compatibility for when OpenCVConfig.cmake is not found. +# 2010/03/22 Benoit Rat, Creation of the script. +# +# +# tested with: +# - OpenCV 2.1: MinGW, MSVC2008 +# - OpenCV 2.0: MinGW, MSVC2008, GCC4 +# +# +## 4: Licence: +# +# LGPL 2.1 : GNU Lesser General Public License Usage +# Alternatively, this file may be used under the terms of the GNU Lesser + +# General Public License version 2.1 as published by the Free Software +# Foundation and appearing in the file LICENSE.LGPL included in the +# packaging of this file. Please review the following information to +# ensure the GNU Lesser General Public License version 2.1 requirements +# will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +# +#---------------------------------------------------------- + + +find_path(OpenCV_DIR "OpenCVConfig.cmake" DOC "Root directory of OpenCV") + +##==================================================== +## Find OpenCV libraries +##---------------------------------------------------- +if(EXISTS "${OpenCV_DIR}") + + #When its possible to use the Config script use it. + if(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake") + + ## Include the standard CMake script + include("${OpenCV_DIR}/OpenCVConfig.cmake") + + ## Search for a specific version + set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}") + + #Otherwise it try to guess it. + else(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake") + + set(OPENCV_LIB_COMPONENTS cxcore cv ml highgui cvaux) + find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "") + if(EXISTS ${OpenCV_INCLUDE_DIR}) + include_directories(${OpenCV_INCLUDE_DIR}) + endif(EXISTS ${OpenCV_INCLUDE_DIR}) + + #Find OpenCV version by looking at cvver.h + file(STRINGS ${OpenCV_INCLUDE_DIR}/cvver.h OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$") + string(REGEX REPLACE ".*#define CV_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MAJOR ${OpenCV_VERSIONS_TMP}) + string(REGEX REPLACE ".*#define CV_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MINOR ${OpenCV_VERSIONS_TMP}) + string(REGEX REPLACE ".*#define CV_SUBMINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_PATCH ${OpenCV_VERSIONS_TMP}) + set(OpenCV_VERSION ${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} CACHE STRING "" FORCE) + set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}") + + endif(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake") + + + + + ## Initiate the variable before the loop + set(GLOBAL OpenCV_LIBS "") + set(OpenCV_FOUND_TMP true) + + ## Loop over each components + foreach(__CVLIB ${OPENCV_LIB_COMPONENTS}) + + find_library(OpenCV_${__CVLIB}_LIBRARY_DEBUG NAMES "${__CVLIB}${CVLIB_SUFFIX}d" "lib${__CVLIB}${CVLIB_SUFFIX}d" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH) + find_library(OpenCV_${__CVLIB}_LIBRARY_RELEASE NAMES "${__CVLIB}${CVLIB_SUFFIX}" "lib${__CVLIB}${CVLIB_SUFFIX}" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH) + + #Remove the cache value + set(OpenCV_${__CVLIB}_LIBRARY "" CACHE STRING "" FORCE) + + #both debug/release + if(OpenCV_${__CVLIB}_LIBRARY_DEBUG AND OpenCV_${__CVLIB}_LIBRARY_RELEASE) + set(OpenCV_${__CVLIB}_LIBRARY debug ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} optimized ${OpenCV_${__CVLIB}_LIBRARY_RELEASE} CACHE STRING "" FORCE) + #only debug + elseif(OpenCV_${__CVLIB}_LIBRARY_DEBUG) + set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} CACHE STRING "" FORCE) + #only release + elseif(OpenCV_${__CVLIB}_LIBRARY_RELEASE) + set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_RELEASE} CACHE STRING "" FORCE) + #no library found + else() + set(OpenCV_FOUND_TMP false) + endif() + + #Add to the general list + if(OpenCV_${__CVLIB}_LIBRARY) + set(OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_${__CVLIB}_LIBRARY}) + endif(OpenCV_${__CVLIB}_LIBRARY) + + endforeach(__CVLIB) + + + set(OpenCV_FOUND ${OpenCV_FOUND_TMP} CACHE BOOL "" FORCE) + + +else(EXISTS "${OpenCV_DIR}") + set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable") +endif(EXISTS "${OpenCV_DIR}") +##==================================================== + + +##==================================================== +## Print message +##---------------------------------------------------- +if(NOT OpenCV_FOUND) + # make FIND_PACKAGE friendly + if(NOT OpenCV_FIND_QUIETLY) + if(OpenCV_FIND_REQUIRED) + message(FATAL_ERROR "OpenCV required but some headers or libs not found. ${ERR_MSG}") + else(OpenCV_FIND_REQUIRED) + message(STATUS "WARNING: OpenCV was not found. ${ERR_MSG}") + endif(OpenCV_FIND_REQUIRED) + endif(NOT OpenCV_FIND_QUIETLY) +endif(NOT OpenCV_FOUND) +##==================================================== + + +##==================================================== +## Backward compatibility +##---------------------------------------------------- +if(OpenCV_FOUND) + option(OpenCV_BACKWARD_COMPA "Add some variable to make this script compatible with the other version of FindOpenCV.cmake" false) + if(OpenCV_BACKWARD_COMPA) + find_path(OpenCV_INCLUDE_DIRS "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory") + find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory") + set(OpenCV_LIBRARIES "${OpenCV_LIBS}" CACHE STRING "" FORCE) + endif(OpenCV_BACKWARD_COMPA) +endif(OpenCV_FOUND) +##==================================================== \ No newline at end of file diff --git a/adm_local/cmake_files/FindSalomeOpenCV.cmake b/adm_local/cmake_files/FindSalomeOpenCV.cmake new file mode 100644 index 000000000..f0c9e4439 --- /dev/null +++ b/adm_local/cmake_files/FindSalomeOpenCV.cmake @@ -0,0 +1,27 @@ +# Copyright (C) 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 +# +# Author: Adrien Bruneton +# + +# OpenGL detection dor Salome +# +# !! Please read the generic detection procedure in SalomeMacros.cmake !! +# +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_DIR) +#MARK_AS_ADVANCED() diff --git a/adm_local/cmake_files/SalomeGEOMConfig.cmake.in b/adm_local/cmake_files/SalomeGEOMConfig.cmake.in new file mode 100644 index 000000000..9d7abb1db --- /dev/null +++ b/adm_local/cmake_files/SalomeGEOMConfig.cmake.in @@ -0,0 +1,137 @@ +# - Config file for the @PROJECT_NAME@ package +# It defines the following variables. +# Specific to the pacakge @PROJECT_NAME@ itself: +# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file +# + +############################################################### +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or +# email : webmaster.salome@opencascade.com +############################################################### + +### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: +@PACKAGE_INIT@ + +# Load the dependencies for the libraries of @PROJECT_NAME@ +# (contains definitions for IMPORTED targets). This is only +# imported if we are not built as a subproject (in this case targets are already there) +IF(NOT TARGET Event AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(GEOM_INCLUDE_DIRS "${GEOM_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@) + +# Advanced options +SET(SALOME_GEOM_USE_GUI @SALOME_GEOM_USE_GUI@) +SET(SALOME_GEOM_USE_OPENCV @SALOME_GEOM_USE_OPENCV@) + +# Level 1 prerequisites: +SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") +SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@") + +# Optional level 1 prerequisites: +IF(SALOME_GEOM_USE_GUI) + SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") +ENDIF() +IF(SALOME_GEOM_USE_OPENCV) + SET_AND_CHECK(OPENCV_ROOT_DIR_EXP "@PACKAGE_OPENCV_ROOT_DIR@") +ENDIF() + +# For all prerequisites, load the corresponding targets if the package was used +# in CONFIG mode. This ensures dependent projects link correctly +# without having to set LD_LIBRARY_PATH: +SET(_PREREQ CAS SalomeGUI OpenCV) +SET(_PREREQ_CONFIG_DIR "@CAS_DIR@" "@SalomeGUI_DIR@" "@OpenCV_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_CMAKE "@SALOME_INSTALL_CMAKE@") +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 GEOM targets: +SET(GEOM_GEOMArchimede GEOMArchimede) +SET(GEOM_BREPExport BREPExport) +SET(GEOM_BREPImport BREPImport) +SET(GEOM_BlockFix BlockFix) +SET(GEOM_GEOMbasic GEOMbasic) +SET(GEOM_GEOMAlgo GEOMAlgo) +SET(GEOM_GEOMClient GEOMClient) +SET(GEOM_GEOMImpl GEOMImpl) +SET(GEOM_GEOMUtils GEOMUtils) +SET(GEOM_GEOMEngine GEOMEngine) +SET(GEOM_GEOM_SupervEngine GEOM_SupervEngine) +SET(GEOM_IGESExport IGESExport) +SET(GEOM_IGESImport IGESImport) +SET(GEOM_NMTDS NMTDS) +SET(GEOM_NMTTools NMTTools) +SET(GEOM_GEOMSketcher GEOMSketcher) +SET(GEOM_SalomeIDLGeom SalomeIDLGeom) +SET(GEOM_STEPExport STEPExport) +SET(GEOM_STEPImport STEPImport) +SET(GEOM_STLExport STLExport) +SET(GEOM_ShHealOper ShHealOper) +SET(GEOM_VTKExport VTKExport) +SET(GEOM_DlgRef DlgRef) +SET(GEOM_GEOM GEOM) +SET(GEOM_GEOMBase GEOMBase) +SET(GEOM_OCC2VTK OCC2VTK) +SET(GEOM_GEOMShapeRec GEOMShapeRec) + diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/CMakeLists.txt old mode 100644 new mode 100755 similarity index 84% rename from adm_local/unix/Makefile.am rename to adm_local/unix/CMakeLists.txt index c68bae141..2f895ae4b --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,6 +17,4 @@ # 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 +ADD_SUBDIRECTORY(config_files) diff --git a/doc/salome/gui/Makefile.am b/adm_local/unix/config_files/CMakeLists.txt old mode 100644 new mode 100755 similarity index 75% rename from doc/salome/gui/Makefile.am rename to adm_local/unix/config_files/CMakeLists.txt index 83135c395..8311d6470 --- a/doc/salome/gui/Makefile.am +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -1,5 +1,8 @@ # 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 @@ -17,14 +20,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -SUBDIRS = GEOM - -usr_docs: - (cd GEOM && $(MAKE) $(AM_MAKEFLAGS) usr_docs) +SET(_m4_data + check_GEOM.m4 + check_OpenCV.m4 + #check_GUI.m4 + ) -docs: usr_docs +INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files) diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am deleted file mode 100644 index 782d75ce3..000000000 --- a/adm_local/unix/make_common_starter.am +++ /dev/null @@ -1,100 +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 - -# ============================================================ -# Cmake files wildcard (to add then to the distribution) -# ============================================================ -CMAKEFILES = $(notdir $(wildcard $(srcdir)/CMakeLists.txt)) - -# 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) \ - $(CMAKEFILES) - -# 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/Makefile.am b/bin/CMakeLists.txt old mode 100644 new mode 100755 similarity index 64% rename from bin/Makefile.am rename to bin/CMakeLists.txt index 6883d1d92..3d2beaa74 --- a/bin/Makefile.am +++ b/bin/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,19 +17,13 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# Author : Guillaume Boulant (CSSI) -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# non-distributed files -nodist_salomescript_DATA = VERSION +SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) -# python files -dist_salomescript_PYTHON = \ - addvars2notebook_GEOM.py \ - geom_setenv.py +# =============================================================== +# Files to be installed +# =============================================================== -# distributed files -dist_salomescript_SCRIPTS = +SET(_bin_scripts + addvars2notebook_GEOM.py geom_setenv.py +) +SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/build_cmake b/build_cmake deleted file mode 100755 index af371a6fc..000000000 --- a/build_cmake +++ /dev/null @@ -1,27 +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 -# - -CURRENT_DIR=`pwd` -CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` -cd ${CONF_DIR} -python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --geom -status=$? -cd ${CURRENT_DIR} -exit $status diff --git a/build_cmake.bat b/build_cmake.bat deleted file mode 100644 index c28ffbaef..000000000 --- a/build_cmake.bat +++ /dev/null @@ -1,20 +0,0 @@ -@REM Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -@REM -@REM This library is free software; you can redistribute it and/or -@REM modify it under the terms of the GNU Lesser General Public -@REM License as published by the Free Software Foundation; either -@REM version 2.1 of the License. -@REM -@REM This library is distributed in the hope that it will be useful, -@REM but WITHOUT ANY WARRANTY; without even the implied warranty of -@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -@REM Lesser General Public License for more details. -@REM -@REM You should have received a copy of the GNU Lesser General Public -@REM License along with this library; if not, write to the Free Software -@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -@REM -@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -@REM - -%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --geom diff --git a/build_configure b/build_configure deleted file mode 100755 index 6f895b447..000000000 --- a/build_configure +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash -# 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 -# Date : 10/10/2002 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# 13/03/2007: Alexander BORODIN - OCN -# Reorganization for usage of autotools -# -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 - -######################################################################## - -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 salome_adm/unix/config_files directory. -# output: -# aclocal.m4 -# autom4te.cache (directory) -echo "======================================================= aclocal" - -if test -d "${GUI_ROOT_DIR}"; then - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files || exit 1 -else - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 -fi - -# ____________________________________________________________________ -# libtoolize creates some configuration files (ltmain.sh, -# config.guess and config.sub). It only depends on the libtool -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). -# output: -# adm_local/unix/config_files/config.guess -# adm_local/unix/config_files/config.sub -# adm_local/unix/config_files/ltmain.sh -echo "==================================================== libtoolize" - -libtoolize --force --copy --automake || exit 1 - -# ____________________________________________________________________ -# autoconf creates the configure script from the file configure.ac (or -# configure.in if configure.ac doesn't exist) -# output: -# configure -echo "====================================================== autoconf" - -autoconf - -# ____________________________________________________________________ -# automake creates some scripts used in building process -# (install-sh, missing, ...). It only depends on the automake -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also -# creates the Makefile.in files from the Makefile.am files. -# output: -# adm_local/unix/config_files/compile -# adm_local/unix/config_files/depcomp -# adm_local/unix/config_files/install-sh -# adm_local/unix/config_files/missing -# adm_local/unix/config_files/py-compile -# Makefile.in (from Makefile.am) -echo "====================================================== automake" - -automake --copy --gnu --add-missing diff --git a/clean_configure b/clean_configure deleted file mode 100755 index 189307676..000000000 --- a/clean_configure +++ /dev/null @@ -1,41 +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 {} \; -#exit -# ==================== ON SORT AVANT - -here=`pwd` -libdir=adm_local/unix/config_files -cd $libdir -# Files created by libtoolize -rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile -# Files created by automake -rm -rf install-sh missing depcomp py-compile -cd $here -find bin -name Makefile.in | xargs rm -f -find doc -name Makefile.in | xargs rm -f -find idl -name Makefile.in | xargs rm -f -find resources -name Makefile.in | xargs rm -f -find adm_local -name Makefile.in | xargs rm -f -find src -name Makefile.in | xargs rm -f -rm -f Makefile.in diff --git a/configure.ac b/configure.ac deleted file mode 100644 index af06e2955..000000000 --- a/configure.ac +++ /dev/null @@ -1,546 +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 -# - -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Created from configure.in.base -# -AC_INIT([Salome2 Project GEOM module], [7.2.0], [webmaster.salome@opencascade.com], [SalomeGEOM]) -AC_CONFIG_AUX_DIR(adm_local/unix/config_files) -AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([tar-pax -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=geom -AC_SUBST(MODULE_NAME) - -echo -echo --------------------------------------------- -echo Initialize source and build root directories -echo --------------------------------------------- -echo - -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 - -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 ! - -echo -echo --------------------------------------------- -echo Configuring production -echo --------------------------------------------- -echo -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='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_CXX_WARNINGS -AC_CXX_TEMPLATE_OPTIONS -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -dnl -dnl Well we use sstream which is not in gcc pre-2.95.3 -dnl We must test if it exists. If not, add it in include ! -dnl - -AC_CXX_HAVE_SSTREAM - -dnl -dnl --------------------------------------------- -dnl testing MPICH -dnl --------------------------------------------- -dnl - -dnl CHECK_MPICH - -echo -echo --------------------------------------------- -echo testing MPI -echo --------------------------------------------- -echo - -CHECK_MPI - -echo -echo --------------------------------------------- -echo testing LEX \& YACC -echo --------------------------------------------- -echo - -lex_yacc_ok=no -AC_PROG_YACC -AC_PROG_LEX -lex_yacc_ok=yes - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing java -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_JAVA - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -AM_PATH_PYTHON(2.3) -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then -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 - -echo -echo --------------------------------------------- -echo testing Corba -echo --------------------------------------------- -echo - -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=adm_local/unix/$corba - -fi - -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_GUI_MODULE - -gui_ok=no -if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then - gui_ok=yes -fi - -AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${gui_ok}" = "yes"]) - -if test "${SalomeGUI_need}" == "yes"; then - if test "${FullGUI_ok}" != "yes"; then - AC_MSG_WARN(For configure GEOM module necessary full GUI!) - fi -elif test "${SalomeGUI_need}" == "auto"; then - if test "${FullGUI_ok}" != "yes"; then - AC_MSG_WARN(Full GUI not found. Build will be done without GUI!) - fi -elif test "${SalomeGUI_need}" == "no"; then - echo Build without GUI option has been chosen -fi - -if test "${gui_ok}" = "yes"; then - echo - echo --------------------------------------------- - echo testing openGL - echo --------------------------------------------- - echo - - CHECK_OPENGL - - echo - echo --------------------------------------------- - echo testing QT - echo --------------------------------------------- - echo - - CHECK_QT -fi - -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo - -CHECK_VTK - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo testing sphinx -echo --------------------------------------------- -echo -CHECK_SPHINX - -echo -echo --------------------------------------------- -echo testing Opencv -echo --------------------------------------------- -echo -CHECK_OPENCV -if test "${opencv_ok}" = "yes"; then - AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV}) -fi - - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -if test "${SalomeGUI_need}" == "no"; then - echo "* Configuration options (without GUI):" -else - echo "* Configuration options:" -fi -echo - -obligatory_vars="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok" -optional_vars="opencv_ok" -gui_vars="OpenGL_ok qt_ok gui_ok" - -### -# mandatory products -### - -echo "--- Mandatory products:" - -missing_obligatory=no -for var in $obligatory_vars -do - eval toto=\$$var - if test x$toto == "x"; then toto="no" ; fi - if test x$toto == "xno"; then missing_obligatory=yes ; fi - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var - #fi -done -if test x$missing_obligatory == "xyes"; then - AC_MSG_ERROR([one or more obligatory product is missing]) -fi - -### -# gui products -### - -if test "${SalomeGUI_need}" == "yes"; then - # SALOME GUI is mandatory - if test "${gui_ok}" != "yes"; then - AC_MSG_ERROR([SALOME GUI is missing]) - fi -fi - -if test "${SalomeGUI_need}" != "no"; then - echo "--- GUI products (optional):" - - for var in $gui_vars - do - eval toto=\$$var - if test x$toto == "x"; then toto="no"; fi - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$toto - done -fi - -### -# optional products -### - -echo "--- Other products (optional):" - -for var in $optional_vars -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 because 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/cmake_files/Makefile \ - adm_local/unix/Makefile \ - adm_local/unix/config_files/Makefile \ - bin/VERSION \ - bin/Makefile \ - GEOM_version.h \ - doc/Makefile \ - doc/docutils/Makefile \ - doc/docutils/conf.py \ - doc/salome/Makefile \ - doc/salome/examples/Makefile \ - doc/salome/gui/Makefile \ - doc/salome/gui/GEOM/Makefile \ - doc/salome/gui/GEOM/doxyfile \ - doc/salome/gui/GEOM/doxyfile_py \ - doc/salome/gui/GEOM/doxyfile_tui \ - doc/salome/gui/GEOM/static/header.html \ - doc/salome/gui/GEOM/static/header_py.html \ - doc/salome/tui/Makefile \ - doc/salome/tui/doxyfile \ - doc/salome/tui/static/header.html \ - src/Makefile \ - src/AdvancedGUI/Makefile \ - src/AdvancedEngine/Makefile \ - src/ARCHIMEDE/Makefile \ - src/BREPExport/Makefile \ - src/BREPImport/Makefile \ - src/BasicGUI/Makefile \ - src/BlocksGUI/Makefile \ - src/BooleanGUI/Makefile \ - src/BuildGUI/Makefile \ - src/DisplayGUI/Makefile \ - src/DlgRef/Makefile \ - src/EntityGUI/Makefile \ - src/GEOM/Makefile \ - src/BlockFix/Makefile \ - src/GEOMAlgo/Makefile \ - src/GEOMBase/Makefile \ - src/GEOMClient/Makefile \ - src/GEOMFiltersSelection/Makefile \ - src/Material/Makefile \ - src/GEOMGUI/Makefile \ - src/GEOMUtils/Makefile \ - src/GEOMImpl/Makefile \ - src/GEOMToolsGUI/Makefile \ - src/GEOM_I/Makefile \ - src/GEOM_I_Superv/Makefile \ - src/GEOM_SWIG/Makefile \ - src/GEOM_SWIG_WITHIHM/Makefile \ - src/GEOM_PY/Makefile \ - src/GEOM_PY/structelem/Makefile \ - src/GenerationGUI/Makefile \ - src/GroupGUI/Makefile \ - src/IGESExport/Makefile \ - src/IGESImport/Makefile \ - src/MeasureGUI/Makefile \ - src/NMTDS/Makefile \ - src/NMTTools/Makefile \ - src/OBJECT/Makefile \ - src/OCC2VTK/Makefile \ - src/OperationGUI/Makefile \ - src/PrimitiveGUI/Makefile \ - src/RepairGUI/Makefile \ - src/SKETCHER/Makefile \ - src/STEPExport/Makefile \ - src/STEPImport/Makefile \ - src/STLExport/Makefile \ - src/ShHealOper/Makefile \ - src/ShapeRecognition/Makefile \ - src/TransformationGUI/Makefile \ - src/VTKExport/Makefile \ - resources/Makefile \ - resources/GEOMCatalog.xml \ - resources/SalomeApp.xml \ - resources/Plugin \ - idl/Makefile \ - Makefile \ -]) diff --git a/adm_local/Makefile.am b/doc/CMakeLists.txt old mode 100644 new mode 100755 similarity index 82% rename from adm_local/Makefile.am rename to doc/CMakeLists.txt index e642b988c..645a52301 --- a/adm_local/Makefile.am +++ b/doc/CMakeLists.txt @@ -1,5 +1,8 @@ # 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 @@ -17,6 +20,5 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = unix cmake_files +ADD_SUBDIRECTORY(salome) +ADD_SUBDIRECTORY(docutils) diff --git a/doc/docutils/CMakeLists.txt b/doc/docutils/CMakeLists.txt new file mode 100755 index 000000000..92b6159f3 --- /dev/null +++ b/doc/docutils/CMakeLists.txt @@ -0,0 +1,82 @@ +# 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 +# + +# This file mainly prepares the environment in which sphinx should run: +# this sets the PYTHONPATH and LD_LIBRARY_PATH to include OMNIORB, DOCUTILS, SETUPTOOLS, etc ... + +# Prepare Sphinx options +SET(SPHINXOPTS +) +SET(SOURCEDIR + ${CMAKE_CURRENT_SOURCE_DIR} +) +SET(PAPEROPT_a4 + -D + latex_paper_size=a4 +) +SET(ALLSPHINXOPTS + -d + doctrees + ${PAPEROPT_a4} + ${SPHINXOPTS} + ${SOURCEDIR} +) + +SALOME_CONFIGURE_FILE(conf.py.in conf.py) + +# Write the shell file preparing the env for the Sphinx run: +# This uses the paths to SPHINX, DOCUTILS and SETUPTOOLS: +# Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake): + +SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +IF(WINDOWS) + STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH% + @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH% + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PYTHONPATH% + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\python\;%PYTHONPATH% + @SET PATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PATH% + ") + SET(EXT "bat") + SET(CALL_STR "call") +ELSE(WINDOWS) + SET(SCR " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH} + export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export LD_LIBRARY_PATH=${OMNIORB_ROOT_DIR}/lib:\${LD_LIBRARY_PATH} + export PYTHONPATH=${SETUPTOOLS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${DOCUTILS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${SPHINX_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH}" + ) + SET(EXT "sh") + SET(CALL_STR ".") +ENDIF(WINDOWS) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") + +ADD_CUSTOM_TARGET(html_docs ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINX_EXECUTABLE} -c ${PROJECT_BINARY_DIR}/doc/docutils -b html ${ALLSPHINXOPTS} docutils +) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils DESTINATION ${SALOME_INSTALL_DOC}/tui/GEOM) +INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/salome/tui/images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/GEOM) diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am deleted file mode 100644 index e2c50f2a3..000000000 --- a/doc/docutils/Makefile.am +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# 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 -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -pydocdir = $(docdir)/tui/GEOM/docutils - -RSTFILES = \ - index.rst \ - overview.rst \ - docapi.rst - -EXTRA_DIST += images $(RSTFILES) - -SPHINXOPTS = -SOURCEDIR = $(srcdir) -SPHINXBUILD = sphinx-build -PAPEROPT_a4 = -D latex_paper_size=a4 -ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR) - -if GEOM_ENABLE_GUI -SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(GUI_ROOT_DIR)/lib/salome:$(GUI_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GUI_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages -else !GEOM_ENABLE_GUI -SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages -endif - -if GEOM_ENABLE_GUI -SPHINX_LD_LIBRARY_PATH = $(GUI_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib -else !GEOM_ENABLE_GUI -SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib -endif - - -.PHONY: latex - -if SPHINX_IS_OK - -html/index.html:$(RSTFILES) - mkdir -p html doctrees - PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \ - LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \ - $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b html $(ALLSPHINXOPTS) html - @echo - @echo "Build finished. The HTML pages are in html." - -else - -html/index.html: - @echo "Documentation for Python package not built. Sphinx was not present at configure time." - -endif - -latex: - mkdir -p latex doctrees - PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \ - LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \ - $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b latex $(ALLSPHINXOPTS) latex - @echo - @echo "Build finished; the LaTeX files are in latex." - @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ - "run these through (pdf)latex." - -install-data-local: html/index.html - test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir) - if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ - cp -rf $$b"html"/* $(pydocdir) ; \ - if test -f $$b"latex"/geompy.pdf; then cp -f $$b"latex"/geompy.pdf $(pydocdir) ; fi; - -uninstall-local: - -test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/* - -clean-local: - -rm -rf html latex doctrees - if test -d "html"; then rm -rf html ; fi - -dist-hook: - -test -d html && cp -Rp html $(distdir) diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt new file mode 100755 index 000000000..ea8a2e204 --- /dev/null +++ b/doc/salome/CMakeLists.txt @@ -0,0 +1,25 @@ +# 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(tui) +ADD_SUBDIRECTORY(gui) +ADD_SUBDIRECTORY(examples) \ No newline at end of file diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am deleted file mode 100644 index f60548c1f..000000000 --- a/doc/salome/Makefile.am +++ /dev/null @@ -1,39 +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 : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -SUBDIRS = tui gui examples -SUBDIRSTUI = tui -SUBDIRSGUI = gui - -usr_docs: - @@SETX@; for d in $(SUBDIRSGUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; - -docs: usr_docs - -dev_docs: - @@SETX@; for d in $(SUBDIRSTUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; diff --git a/doc/salome/examples/Makefile.am b/doc/salome/examples/Makefile.am deleted file mode 100644 index 034ad1597..000000000 --- a/doc/salome/examples/Makefile.am +++ /dev/null @@ -1,147 +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 -# Author : Alexander KOVALEV (Open Cascade NN) -# Modified by : -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -pyexamplesdir = $(docdir)/examples/GEOM - -BAD_TESTS = \ - repairing_operations_ex09.py - -GOOD_TESTS = \ - 3dsketcher.py \ - advanced_geom_objs_ex01.py \ - advanced_geom_objs_ex02.py \ - advanced_geom_objs_ex03.py \ - angle.py \ - arranging_study_objects.py \ - basic_geom_objs_ex01.py \ - basic_geom_objs_ex02.py \ - basic_geom_objs_ex03.py \ - basic_geom_objs_ex04.py \ - basic_geom_objs_ex05.py \ - basic_geom_objs_ex06.py \ - basic_geom_objs_ex07.py \ - basic_geom_objs_ex08.py \ - basic_geom_objs_ex09.py \ - basic_operations_ex01.py \ - basic_operations_ex02.py \ - basic_operations_ex03.py \ - basic_properties.py \ - blocks_operations_ex01.py \ - blocks_operations_ex02.py \ - blocks_operations_ex03.py \ - boolean_operations_ex01.py \ - boolean_operations_ex02.py \ - boolean_operations_ex03.py \ - boolean_operations_ex04.py \ - bounding_box.py \ - building_by_blocks_ex01.py \ - building_by_blocks_ex02.py \ - center_of_mass.py \ - check_compound_of_blocks.py \ - check_self_intersections.py \ - check_shape.py \ - complex_objs_ex01.py \ - complex_objs_ex02.py \ - complex_objs_ex03.py \ - complex_objs_ex04.py \ - complex_objs_ex05.py \ - complex_objs_ex06.py \ - complex_objs_ex07.py \ - complex_objs_ex08.py \ - complex_objs_ex09.py \ - complex_objs_ex10.py \ - free_boundaries.py \ - free_faces.py \ - GEOM_box.py \ - get_non_blocks.py \ - import_export.py \ - inertia.py \ - min_distance.py \ - normal_face.py \ - notebook_geom.py \ - point_coordinates.py \ - primitives_ex01.py \ - primitives_ex02.py \ - primitives_ex03.py \ - primitives_ex04.py \ - primitives_ex05.py \ - primitives_ex06.py \ - primitives_ex07.py \ - repairing_operations_ex01.py \ - repairing_operations_ex02.py \ - repairing_operations_ex03.py \ - repairing_operations_ex04.py \ - repairing_operations_ex05.py \ - repairing_operations_ex06.py \ - repairing_operations_ex07.py \ - repairing_operations_ex08.py \ - repairing_operations_ex10.py \ - repairing_operations_ex11.py \ - repairing_operations_ex12.py \ - sketcher.py \ - tolerance.py \ - topological_geom_objs_ex01.py \ - topological_geom_objs_ex02.py \ - topological_geom_objs_ex03.py \ - topological_geom_objs_ex04.py \ - topological_geom_objs_ex05.py \ - topological_geom_objs_ex06.py \ - transformation_operations_ex01.py \ - transformation_operations_ex02.py \ - transformation_operations_ex03.py \ - transformation_operations_ex04.py \ - transformation_operations_ex05.py \ - transformation_operations_ex06.py \ - transformation_operations_ex07.py \ - transformation_operations_ex08.py \ - transformation_operations_ex09.py \ - transformation_operations_ex10.py \ - transformation_operations_ex11.py \ - transformation_operations_ex12.py \ - transformation_operations_ex13.py \ - viewing_geom_objs_ex01.py \ - viewing_geom_objs_ex02.py \ - viewing_geom_objs_ex03.py \ - viewing_geom_objs_ex04.py \ - whatis.py \ - working_with_groups_ex01.py \ - working_with_groups_ex02.py \ - working_with_groups_ex03.py \ - working_with_groups_ex04.py \ - working_with_groups_ex05.py \ - working_with_groups_ex06.py - -pyexamples_SCRIPTS = $(BAD_TESTS) $(GOOD_TESTS) - -EXTRA_DIST += $(pyexamples_SCRIPTS) testme.py - -THIS_PYTHONPATH = $(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome -THIS_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome - -installcheck-local: - @for f in $(GOOD_TESTS) ; do \ - GEOM_ROOT_DIR=$(prefix) PYTHONPATH=$(THIS_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(THIS_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} python -B $(top_srcdir)/doc/salome/examples/testme.py $(top_srcdir)/doc/salome/examples/$$f || exit 1; \ - done diff --git a/adm_local/unix/config_files/Makefile.am b/doc/salome/gui/CMakeLists.txt old mode 100644 new mode 100755 similarity index 85% rename from adm_local/unix/config_files/Makefile.am rename to doc/salome/gui/CMakeLists.txt index 2d5efa587..c7e070cf5 --- a/adm_local/unix/config_files/Makefile.am +++ b/doc/salome/gui/CMakeLists.txt @@ -1,5 +1,8 @@ # 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 @@ -17,9 +20,4 @@ # 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_GEOM.m4 \ -check_GUI.m4 \ -check_OpenCV.m4 +ADD_SUBDIRECTORY(GEOM) diff --git a/doc/salome/gui/GEOM/CMakeLists.txt b/doc/salome/gui/GEOM/CMakeLists.txt index 111e25f60..9a8550ef7 100644 --- a/doc/salome/gui/GEOM/CMakeLists.txt +++ b/doc/salome/gui/GEOM/CMakeLists.txt @@ -51,3 +51,7 @@ ADD_CUSTOM_TARGET(usr_docs mkdir -p tmp ) ADD_DEPENDENCIES(usr_docs html_docs) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${SALOME_INSTALL_DOC}/gui) +INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GEOM) diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am deleted file mode 100755 index f5526d2e0..000000000 --- a/doc/salome/gui/GEOM/Makefile.am +++ /dev/null @@ -1,73 +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 : Vasily Rusyaev (Open Cascade NN) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -EXTRA_DIST += images input static/footer.html static/salome_extra.css static/SALOME_BOA_PA.pdf - -guidocdir = $(docdir)/gui/GEOM -guidoc_DATA = images/head.png static/SALOME_BOA_PA.pdf - -tmp/geomBuilder.py: $(top_srcdir)/src/GEOM_SWIG/geomBuilder.py - mkdir -p tmp && $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py -o $@ $< - -tmp/gsketcher.py: $(top_srcdir)/src/GEOM_SWIG/gsketcher.py - mkdir -p tmp && $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py -o $@ $< - -usr_docs: doxyfile_tui doxyfile_py doxyfile tmp/geomBuilder.py tmp/gsketcher.py - @echo "Generating user documentation" ; \ - $(DOXYGEN) doxyfile_tui ; \ - $(DOXYGEN) doxyfile_py ; \ - $(DOXYGEN) doxyfile - -docs: usr_docs - -clean-local: - @for filen in `find . -maxdepth 1` ; do \ - case $${filen} in \ - ./Makefile* | ./doxyfile* | ./images | ./input | ./static ) ;; \ - . | .. | ./CVS ) ;; \ - *) echo "Removing $${filen}" ; rm -rf $${filen} ;; \ - esac ; \ - done ; - -install-data-local: usr_docs - @if [ -e index.html ]; then \ - $(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM ; \ - for filen in `find . -maxdepth 1` ; do \ - case $${filen} in \ - . | .. | ./static | ./tmp | ./Makefile* | ./doxyfile* ) ;; \ - *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/GEOM ;; \ - esac ; \ - done ; \ - cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/GEOM/geompy_doc ; \ - mkdir $(DESTDIR)$(docdir)/gui/GEOM/input ; \ - cp -rp $(srcdir)/input/geompy_migration.doc $(DESTDIR)$(docdir)/gui/GEOM/input ; \ - cp -rp $(srcdir)/input/tui_auto_completion_documentation.doc $(DESTDIR)$(docdir)/gui/GEOM/input ; \ - cp -rp $(srcdir)/input/tui_execution_distribution.doc $(DESTDIR)$(docdir)/gui/GEOM/input ; \ - fi - - -uninstall-local: - rm -rf $(DESTDIR)$(docdir)/gui/GEOM diff --git a/doc/Makefile.am b/doc/salome/tui/CMakeLists.txt old mode 100644 new mode 100755 similarity index 52% rename from doc/Makefile.am rename to doc/salome/tui/CMakeLists.txt index 0cf99ebd0..fa59289de --- a/doc/Makefile.am +++ b/doc/salome/tui/CMakeLists.txt @@ -1,5 +1,8 @@ # 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 @@ -17,18 +20,12 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -SUBDIRS = salome docutils -#SUBDIRS = salome - -usr_docs: - (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs: usr_docs +SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) +SALOME_CONFIGURE_FILE(static/header.html.in static/header.html) + +ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE} + COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/GUI''', True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}/GUI''', r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/GUI'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''', r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/GUI''')" + VERBATIM + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) -dev_docs: - (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am deleted file mode 100644 index b72bc7612..000000000 --- a/doc/salome/tui/Makefile.am +++ /dev/null @@ -1,61 +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 : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -EXTRA_DIST += images input static/footer.html static/salome_extra.css - -tuidocdir = $(docdir)/tui/GEOM -tuidoc_DATA = images/head.png images/geomscreen.png - -dev_docs: doxyfile - echo "===========================================" ; \ - echo "Process geomBuilder.py for documentation generation" ; \ - echo "===========================================" ; \ - $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py $(top_srcdir)/src/GEOM_SWIG/geomBuilder.py ; \ - echo "===========================================" ; \ - echo "Generating TUI documentation" ; \ - echo "===========================================" ; \ - $(DOXYGEN) doxyfile ; \ - rm -f ./geomBuilder.py - -clean-local: - -rm -fr GEOM doxygen.bak - -install-data-local: - if test -d GEOM; then \ - $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \ - cp -rp GEOM $(DESTDIR)$(docdir)/tui ; \ - fi; - -uninstall-local: - @test -d $(DESTDIR)$(tuidocdir) && chmod -R +w $(DESTDIR)$(tuidocdir) ; \ - for filen in `find $(DESTDIR)$(tuidocdir) -mindepth 1 -maxdepth 1` dummy ; do \ - case $${filen} in \ - dummy ) ;; \ - $(DESTDIR)$(tuidocdir)/docutils ) ;; \ - $(DESTDIR)$(tuidocdir)/head.png ) ;; \ - $(DESTDIR)$(tuidocdir)/geomscreen.png ) ;; \ - * ) echo "removing $${filen}" && rm -rf $${filen} ;; \ - esac ; \ - done diff --git a/src/STLExport/Makefile.am b/idl/CMakeLists.txt old mode 100644 new mode 100755 similarity index 57% rename from src/STLExport/Makefile.am rename to idl/CMakeLists.txt index 70a75617a..692807b50 --- a/src/STLExport/Makefile.am +++ b/idl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,24 +17,26 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +INCLUDE(UseOmniORB) -# header files -salomeinclude_HEADERS = +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) -# Libraries targets -lib_LTLIBRARIES = libSTLExport.la +SET(SalomeIDLGEOM_IDLSOURCES + GEOM_Gen.idl + GEOM_Superv.idl +) -dist_libSTLExport_la_SOURCES = \ - STLExport.cxx +SET(IDL_INCLUDE_DIRS + ${KERNEL_ROOT_DIR}/idl/salome + ${CMAKE_CURRENT_SOURCE_DIR} +) +SET(IDL_LINK_FLAGS + ${KERNEL_SalomeIDLKernel} +) -# additional information to compile and link file - -libSTLExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -libSTLExport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKSTL +OMNIORB_ADD_MODULE(SalomeIDLGEOM "${SalomeIDLGEOM_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" "${IDL_LINK_FLAGS}") +INSTALL(TARGETS SalomeIDLGEOM EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/idl/Makefile.am b/idl/Makefile.am deleted file mode 100644 index e41fed90f..000000000 --- a/idl/Makefile.am +++ /dev/null @@ -1,92 +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 = GEOM_Gen.idl GEOM_Superv.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 = libSalomeIDLGEOM.la - -# Sources built from idl files -nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.cc - -# header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) - -libSalomeIDLGEOM_la_CPPFLAGS = \ - -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ -libSalomeIDLGEOM_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLGEOM_la_LIBADD = $(STDLIB) @CORBA_LIBS@ $(KERNEL_LDFLAGS) -lSalomeIDLKernel - -# 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 - -%SK.cc %.hh : %.idl - $(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 GEOM ; 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 000000000..164807296 --- /dev/null +++ b/resources/CMakeLists.txt @@ -0,0 +1,270 @@ +# 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( _res_files + GEOMActions.xml + GEOM_en.xml + GEOM_fr.xml + GEOM.config + GEOMDS_Resources + ImportExport + ShHealing + 3dsketch.png + angle.png + arc.png + arccenter.png + arcofellipse.png + archimede.png + axisinertia.png + basicproperties.png + bounding.png + box.png + box2points.png + boxdxyz.png + build_compound.png + build_edge.png + build_edge_wire.png + build_edge_curve.png + build_face.png + build_shell.png + build_solid.png + build_wire.png + centergravity.png + chamfer.png + chamferall.png + chamferedge.png + chamferface.png + chamferedgefromface.png + change_orientation.png + change_direction.png + check.png + circle.png + circlepointvector.png + circle3points.png + circlecenter2pnts.png + common.png + cone.png + conedxyz.png + conepointvector.png + cut.png + cylinder.png + cylinderdxyz.png + cylinderpointvector.png + delete.png + divided_disk.png + disk.png + disk3points.png + disk_pntvecr.png + disk_r.png + display.png + displayonly.png + displayall.png + draft.png + erase.png + eraseall.png + extruded_boss.png + extruded_cut.png + face_hw.png + face_vechw.png + feature_detect.png + fillet.png + fillet1d.png + fillet2d.png + filletall.png + filletedge.png + filletwire.png + filletface.png + filling.png + folder.png + fuse.png + fuse_collinear_edges.png + geometry.png + import_picture.png + limit_tolerance.png + line.png + line2points.png + line2faces.png + mindist.png + mirrorPoint.png + mirrorAxe.png + mirrorPlane.png + ModuleGeom.png + multirotation.png + multirotationdouble.png + multirotationsimple.png + multitranslation.png + multitranslationdouble.png + multitranslationsimple.png + normale.png + offset.png + projection.png + origin_and_vectors.png + partition.png + partitionkeep.png + partitionplane.png + pipe.png + pipebinormal.png + plane.png + planeWorking.png + plane3points.png + planeface.png + planepointvector.png + planeworkingface.png + planeworkingvector.png + planeworkingorigin.png + point2.png + pointonedge.png + pointonface.png + point_line_intersection.png + polyline.png + prism.png + prism2.png + prism3.png + rectangle.png + revol.png + rotate.png + rotatepnt.png + scale.png + scale_along_axes.png + section.png + select1.png + sewing.png + shading.png + shading_with_edges.png + shapesonshape.png + shared_shapes.png + sketch.png + sphere.png + spheredxyz.png + spherepoint.png + subshape.png + supressHolesOnFaceShell.png + supressface.png + supresshole.png + tolerance.png + torus.png + torusdxyz.png + toruspointvector.png + translationDxyz.png + translationPoints.png + translationVector.png + tree_compound.png + tree_compsolid.png + tree_edge.png + tree_face.png + tree_shape.png + tree_shell.png + tree_solid.png + tree_vertex.png + tree_wire.png + tree_group_vertex.png + tree_group_edge.png + tree_group_face.png + tree_group_solid.png + tree_lcs.png + vector.png + vector_mode.png + vector2points.png + vectordxyz.png + wireframe.png + whatis.png + ellipse.png + ellipsepointvector.png + bezier.png + interpol.png + spline.png + closecontour.png + suppressintwires.png + marker.png + marker2.png + marker3.png + marker_1.png + marker_2.png + marker_3.png + marker_4.png + marker_5.png + marker_6.png + marker_7.png + marker_8.png + marker_9.png + marker_10.png + marker_11.png + marker_12.png + marker_13.png + position.png + position2.png + position3.png + free_bound.png + point_coord.png + point3.png + shapeprocess.png + block_2f.png + block_6f.png + block_face_2e.png + block_face_4e.png + block_face_4v.png + block_multitrsf_double.png + block_multitrsf_simple.png + tree_block.png + subblock.png + group_new.png + group_edit.png + glue.png + check_blocks_compound.png + get_non_blocks.png + check_self_intersections.png + free_faces.png + propagate.png + redo.png + undo.png + glue2.png + remove_webs.png + remove_extra_edges.png + union_faces.png + coordsys.png + translation.png + # ADVANCED_RESOURCES: + pipetshape.png tree_pipetshape.png pipetshape_import_icon.png pipetshape_section.png + dlg_pipetshape.png dlg_pipetshapechamfer.png dlg_pipetshapefillet.png + dlg_pipetshapel1.png dlg_pipetshaper1.png dlg_pipetshapew1.png + dlg_pipetshapel2.png dlg_pipetshaper2.png dlg_pipetshapew2.png + dlg_pipetshapechamferl1.png dlg_pipetshapechamferr1.png dlg_pipetshapechamferw1.png + dlg_pipetshapechamferl2.png dlg_pipetshapechamferr2.png dlg_pipetshapechamferw2.png + dlg_pipetshapechamferh.png dlg_pipetshapechamferw.png + dlg_pipetshapefilletl1.png dlg_pipetshapefilletr1.png dlg_pipetshapefilletw1.png + dlg_pipetshapefilletl2.png dlg_pipetshapefilletr2.png dlg_pipetshapefilletw2.png + dlg_pipetshapefilletrf.png + dividedcylinder.png dividedcylinder_r_h.png + smoothingsurface.png smoothingsurface_lpoints.png tree_smoothingsurface.png + ##@@ insert new functions before this line @@ do not remove this line @@## + ) +INSTALL(FILES ${_res_files} DESTINATION ${SALOME_GEOM_INSTALL_RES_DATA}) + +SALOME_CONFIGURE_FILE(GEOMCatalog.xml.in GEOMCatalog.xml INSTALL ${SALOME_GEOM_INSTALL_RES_DATA}) +SALOME_CONFIGURE_FILE(SalomeApp.xml.in SalomeApp.xml INSTALL ${SALOME_GEOM_INSTALL_RES_DATA}) +SALOME_CONFIGURE_FILE(Plugin.in Plugin INSTALL ${SALOME_GEOM_INSTALL_RES_DATA}) + + + + diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index 0fd04dc92..000000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,270 +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 - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomeres_DATA = \ -GEOMActions.xml \ -GEOM_en.xml \ -GEOM_fr.xml \ -GEOM.config \ -GEOMDS_Resources \ -ImportExport \ -ShHealing \ -3dsketch.png \ -angle.png \ -arc.png \ -arccenter.png \ -arcofellipse.png \ -archimede.png \ -axisinertia.png \ -basicproperties.png \ -bounding.png \ -box.png \ -box2points.png \ -boxdxyz.png \ -build_compound.png \ -build_edge.png \ -build_edge_wire.png \ -build_edge_curve.png \ -build_face.png \ -build_shell.png \ -build_solid.png \ -build_wire.png \ -centergravity.png \ -chamfer.png \ -chamferall.png \ -chamferedge.png \ -chamferface.png \ -chamferedgefromface.png \ -change_orientation.png \ -change_direction.png \ -check.png \ -circle.png \ -circlepointvector.png \ -circle3points.png \ -circlecenter2pnts.png \ -common.png \ -cone.png \ -conedxyz.png \ -conepointvector.png \ -cut.png \ -cylinder.png \ -cylinderdxyz.png \ -cylinderpointvector.png \ -delete.png \ -divided_disk.png \ -disk.png \ -disk3points.png \ -disk_pntvecr.png \ -disk_r.png \ -display.png \ -displayonly.png \ -displayall.png \ -draft.png \ -erase.png \ -eraseall.png \ -extruded_boss.png \ -extruded_cut.png \ -face_hw.png \ -face_vechw.png \ -feature_detect.png \ -fillet.png \ -fillet1d.png \ -fillet2d.png \ -filletall.png \ -filletedge.png \ -filletwire.png \ -filletface.png \ -filling.png \ -folder.png \ -fuse.png \ -fuse_collinear_edges.png \ -geometry.png \ -import_picture.png \ -limit_tolerance.png \ -line.png \ -line2points.png \ -line2faces.png \ -mindist.png \ -mirrorPoint.png \ -mirrorAxe.png \ -mirrorPlane.png \ -ModuleGeom.png \ -multirotation.png \ -multirotationdouble.png \ -multirotationsimple.png \ -multitranslation.png \ -multitranslationdouble.png \ -multitranslationsimple.png \ -normale.png \ -offset.png \ -projection.png \ -origin_and_vectors.png \ -partition.png \ -partitionkeep.png \ -partitionplane.png \ -pipe.png \ -pipebinormal.png \ -plane.png \ -planeWorking.png \ -plane3points.png \ -planeface.png \ -planepointvector.png \ -planeworkingface.png \ -planeworkingvector.png \ -planeworkingorigin.png \ -point2.png \ -pointonedge.png \ -pointonface.png \ -point_line_intersection.png \ -polyline.png \ -prism.png \ -prism2.png \ -prism3.png \ -rectangle.png \ -revol.png \ -rotate.png \ -rotatepnt.png \ -scale.png \ -scale_along_axes.png \ -section.png \ -select1.png \ -sewing.png \ -shading.png \ -shading_with_edges.png \ -shapesonshape.png \ -shared_shapes.png \ -sketch.png \ -sphere.png \ -spheredxyz.png \ -spherepoint.png \ -subshape.png \ -supressHolesOnFaceShell.png \ -supressface.png \ -supresshole.png \ -tolerance.png \ -torus.png \ -torusdxyz.png \ -toruspointvector.png \ -translationDxyz.png \ -translationPoints.png \ -translationVector.png \ -tree_compound.png \ -tree_compsolid.png \ -tree_edge.png \ -tree_face.png \ -tree_shape.png \ -tree_shell.png \ -tree_solid.png \ -tree_vertex.png \ -tree_wire.png \ -tree_group_vertex.png \ -tree_group_edge.png \ -tree_group_face.png \ -tree_group_solid.png \ -tree_lcs.png \ -vector.png \ -vector_mode.png \ -vector2points.png \ -vectordxyz.png \ -wireframe.png \ -whatis.png \ -ellipse.png \ -ellipsepointvector.png \ -bezier.png \ -interpol.png \ -spline.png \ -closecontour.png \ -suppressintwires.png \ -marker.png \ -marker2.png \ -marker3.png \ -marker_1.png \ -marker_2.png \ -marker_3.png \ -marker_4.png \ -marker_5.png \ -marker_6.png \ -marker_7.png \ -marker_8.png \ -marker_9.png \ -marker_10.png \ -marker_11.png \ -marker_12.png \ -marker_13.png \ -position.png \ -position2.png \ -position3.png \ -free_bound.png \ -point_coord.png \ -point3.png \ -shapeprocess.png \ -block_2f.png \ -block_6f.png \ -block_face_2e.png \ -block_face_4e.png \ -block_face_4v.png \ -block_multitrsf_double.png \ -block_multitrsf_simple.png \ -tree_block.png \ -subblock.png \ -group_new.png \ -group_edit.png \ -glue.png \ -check_blocks_compound.png \ -get_non_blocks.png \ -check_self_intersections.png \ -free_faces.png \ -propagate.png \ -redo.png \ -undo.png \ -glue2.png \ -remove_webs.png \ -remove_extra_edges.png \ -union_faces.png \ -coordsys.png \ -translation.png - -ADVANCED_RESOURCES = -ADVANCED_RESOURCES += pipetshape.png tree_pipetshape.png pipetshape_import_icon.png pipetshape_section.png -ADVANCED_RESOURCES += dlg_pipetshape.png dlg_pipetshapechamfer.png dlg_pipetshapefillet.png -ADVANCED_RESOURCES += dlg_pipetshapel1.png dlg_pipetshaper1.png dlg_pipetshapew1.png -ADVANCED_RESOURCES += dlg_pipetshapel2.png dlg_pipetshaper2.png dlg_pipetshapew2.png -ADVANCED_RESOURCES += dlg_pipetshapechamferl1.png dlg_pipetshapechamferr1.png dlg_pipetshapechamferw1.png -ADVANCED_RESOURCES += dlg_pipetshapechamferl2.png dlg_pipetshapechamferr2.png dlg_pipetshapechamferw2.png -ADVANCED_RESOURCES += dlg_pipetshapechamferh.png dlg_pipetshapechamferw.png -ADVANCED_RESOURCES += dlg_pipetshapefilletl1.png dlg_pipetshapefilletr1.png dlg_pipetshapefilletw1.png -ADVANCED_RESOURCES += dlg_pipetshapefilletl2.png dlg_pipetshapefilletr2.png dlg_pipetshapefilletw2.png -ADVANCED_RESOURCES += dlg_pipetshapefilletrf.png -# ADVANCED_RESOURCES += divideddisk.png divideddisk_r_ratio.png tree_divideddisk.png -ADVANCED_RESOURCES += dividedcylinder.png dividedcylinder_r_h.png -# tree_dividedcylinder.png -ADVANCED_RESOURCES += smoothingsurface.png smoothingsurface_lpoints.png tree_smoothingsurface.png -##@@ insert new functions before this line @@ do not remove this line @@## - -dist_salomeres_DATA += $(ADVANCED_RESOURCES) - -# VSR: little trick to avoid putting if GEOMCatalog.xml to the distribution archive -nodist_salomeres_SCRIPTS = GEOMCatalog.xml SalomeApp.xml Plugin diff --git a/src/ARCHIMEDE/CMakeLists.txt b/src/ARCHIMEDE/CMakeLists.txt new file mode 100755 index 000000000..7537b4f22 --- /dev/null +++ b/src/ARCHIMEDE/CMakeLists.txt @@ -0,0 +1,53 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} ${CAS_MODELER} ${CAS_TKMesh} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(Archimede_HEADERS Archimede_VolumeSection.hxx) + +# --- sources --- + +SET(Archimede_SOURCES Archimede_VolumeSection.cxx) + +# --- rules --- + +ADD_LIBRARY(GEOMArchimede ${Archimede_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMArchimede ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMArchimede EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +#INSTALL(FILES ${Archimede_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/ARCHIMEDE/Makefile.am b/src/ARCHIMEDE/Makefile.am deleted file mode 100644 index 1400fb9b5..000000000 --- a/src/ARCHIMEDE/Makefile.am +++ /dev/null @@ -1,50 +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 -# - -# GEOM ARCHIMEDE : algorithm implementation -# File : Makefile.am -# Author : Nicolas REJNERI -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -salomeinclude_HEADERS = \ - Archimede_VolumeSection.hxx - -# Libraries targets - -lib_LTLIBRARIES = libGEOMArchimede.la - -# sources files -dist_libGEOMArchimede_la_SOURCES = \ - Archimede_VolumeSection.cxx - - -# additional information to compile and link file - -libGEOMArchimede_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -libGEOMArchimede_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(CAS_KERNEL) \ - $(CAS_MODELER) -lTKMesh \ - $(STDLIB) diff --git a/src/AdvancedEngine/CMakeLists.txt b/src/AdvancedEngine/CMakeLists.txt new file mode 100755 index 000000000..448d075b1 --- /dev/null +++ b/src/AdvancedEngine/CMakeLists.txt @@ -0,0 +1,91 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOM + ${PROJECT_SOURCE_DIR}/src/GEOMAlgo + ${PROJECT_SOURCE_DIR}/src/GEOM_I + ${PROJECT_SOURCE_DIR}/src/NMTTools + ${PROJECT_SOURCE_DIR}/src/NMTDS + ${PROJECT_SOURCE_DIR}/src/GEOMUtils + ${PROJECT_BINARY_DIR}/idl + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMEngine + SalomeIDLGEOM + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeGenericObj} + ${KERNEL_TOOLSDS} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ) + +# --- headers --- + +SET(AdvancedEngine_HEADERS + AdvancedEngine_Types.hxx + # AdvancedEngine_OperationsCreator.hh + # GEOM_AdvancedEngine.hxx + # GEOMImpl_IAdvancedOperations.hxx + # GEOM_IAdvancedOperations_i.hh + # #ADVANCED_INCLUDES: + # GEOMImpl_IPipeTShape.hxx GEOMImpl_PipeTShapeDriver.hxx + # GEOMImpl_IDividedDisk.hxx GEOMImpl_DividedDiskDriver.hxx + # GEOMImpl_IDividedCylinder.hxx GEOMImpl_DividedCylinderDriver.hxx + # GEOMImpl_ISmoothingSurface.hxx GEOMImpl_SmoothingSurfaceDriver.hxx + ) +# --- sources --- + +SET(AdvancedEngine_SOURCES + AdvancedEngine.cxx + AdvancedEngine_OperationsCreator.cc + GEOMImpl_IAdvancedOperations.cxx + GEOM_IAdvancedOperations_i.cc + # ADVANCED_SOURCES: + GEOMImpl_PipeTShapeDriver.cxx + GEOMImpl_DividedDiskDriver.cxx + #GEOMImpl_DividedCylinderDriver.cxx + GEOMImpl_SmoothingSurfaceDriver.cxx + ##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@## + ) + +# --- rules --- + +ADD_LIBRARY(AdvancedEngine ${AdvancedEngine_SOURCES}) +TARGET_LINK_LIBRARIES(AdvancedEngine ${_link_LIBRARIES}) +INSTALL(TARGETS AdvancedEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${AdvancedEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) \ No newline at end of file diff --git a/src/AdvancedEngine/Makefile.am b/src/AdvancedEngine/Makefile.am deleted file mode 100644 index a8af35ffc..000000000 --- a/src/AdvancedEngine/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libAdvancedEngine.la - -# header files -salomeinclude_HEADERS = \ - AdvancedEngine_Types.hxx \ - AdvancedEngine_OperationsCreator.hh \ - GEOM_AdvancedEngine.hxx \ - GEOMImpl_IAdvancedOperations.hxx \ - GEOM_IAdvancedOperations_i.hh - -ADVANCED_INCLUDES = -ADVANCED_INCLUDES += GEOMImpl_IPipeTShape.hxx GEOMImpl_PipeTShapeDriver.hxx -ADVANCED_INCLUDES += GEOMImpl_IDividedDisk.hxx GEOMImpl_DividedDiskDriver.hxx -##ADVANCED_INCLUDES += GEOMImpl_IDividedCylinder.hxx GEOMImpl_DividedCylinderDriver.hxx -ADVANCED_INCLUDES += GEOMImpl_ISmoothingSurface.hxx GEOMImpl_SmoothingSurfaceDriver.hxx -##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@## - -salomeinclude_HEADERS += $(ADVANCED_INCLUDES) - -dist_libAdvancedEngine_la_SOURCES = \ - AdvancedEngine.cxx \ - AdvancedEngine_OperationsCreator.cc \ - GEOMImpl_IAdvancedOperations.cxx \ - GEOM_IAdvancedOperations_i.cc - -ADVANCED_SOURCES = -ADVANCED_SOURCES += GEOMImpl_PipeTShapeDriver.cxx -ADVANCED_SOURCES += GEOMImpl_DividedDiskDriver.cxx -##ADVANCED_SOURCES += GEOMImpl_DividedCylinderDriver.cxx -ADVANCED_SOURCES += GEOMImpl_SmoothingSurfaceDriver.cxx -##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@## - -dist_libAdvancedEngine_la_SOURCES += $(ADVANCED_SOURCES) - -# additional information to compile and link file - -libAdvancedEngine_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../GEOMUtils \ - -I$(srcdir)/../NMTDS \ - -I$(srcdir)/../NMTTools \ - -I$(srcdir)/../GEOMAlgo \ - -I$(srcdir)/../GEOM \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOM_I \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libAdvancedEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLGEOM.la \ - ../GEOMUtils/libGEOMUtils.la \ - ../GEOMAlgo/libGEOMAlgo.la \ - ../GEOM/libGEOMbasic.la \ - ../GEOMImpl/libGEOMimpl.la \ - ../GEOM_I/libGEOMEngine.la \ - $(KERNEL_LDFLAGS) -lOpUtil -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ - $(CAS_DATAEXCHANGE) \ - $(CAS_LDPATH) -lTKFillet -lTKOffset diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt new file mode 100755 index 000000000..b9df1acae --- /dev/null +++ b/src/AdvancedGUI/CMakeLists.txt @@ -0,0 +1,116 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# resource files / to be processed by lrelease +SET(AdvancedGUI_RESOURCES + AdvancedGUI_images.ts + AdvancedGUI_msg_en.ts + AdvancedGUI_msg_fr.ts + AdvancedGUI_msg_ja.ts + ) + +# --- headers --- + +SET(AdvancedGUI_HEADERS + AdvancedGUI.h + AdvancedGUI_PipeTShapeDlg.h + AdvancedGUI_DividedDiskDlg.h + AdvancedGUI_DividedCylinderDlg.h + AdvancedGUI_SmoothingSurfaceDlg.h +##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + AdvancedGUI_PipeTShapeDlg.h + AdvancedGUI_DividedDiskDlg.h + AdvancedGUI_DividedCylinderDlg.h + AdvancedGUI_SmoothingSurfaceDlg.h + ##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(AdvancedGUI_SOURCES + AdvancedGUI_PipeTShapeDlg.cxx + AdvancedGUI_DividedDiskDlg.cxx + AdvancedGUI_DividedCylinderDlg.cxx + AdvancedGUI_SmoothingSurfaceDlg.cxx +##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(AdvancedGUI ${AdvancedGUI_SOURCES}) +TARGET_LINK_LIBRARIES(AdvancedGUI ${_link_LIBRARIES}) +INSTALL(TARGETS AdvancedGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +QT4_INSTALL_TS_RESOURCES("${AdvancedGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}") diff --git a/src/AdvancedGUI/Makefile.am b/src/AdvancedGUI/Makefile.am deleted file mode 100644 index 436727e37..000000000 --- a/src/AdvancedGUI/Makefile.am +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com - -# File : Makefile.am -# Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - AdvancedGUI.h - -ADVANCED_INCLUDES = -ADVANCED_INCLUDES += AdvancedGUI_PipeTShapeDlg.h -ADVANCED_INCLUDES += AdvancedGUI_DividedDiskDlg.h -ADVANCED_INCLUDES += AdvancedGUI_DividedCylinderDlg.h -ADVANCED_INCLUDES += AdvancedGUI_SmoothingSurfaceDlg.h -##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## - -salomeinclude_HEADERS += $(ADVANCED_INCLUDES) - -# Libraries targets -lib_LTLIBRARIES = libAdvancedGUI.la - -dist_libAdvancedGUI_la_SOURCES = \ - AdvancedGUI.h \ - AdvancedGUI.cxx - -ADVANCED_SOURCES = -ADVANCED_SOURCES += AdvancedGUI_PipeTShapeDlg.h AdvancedGUI_PipeTShapeDlg.cxx -ADVANCED_SOURCES += AdvancedGUI_DividedDiskDlg.h AdvancedGUI_DividedDiskDlg.cxx -ADVANCED_SOURCES += AdvancedGUI_DividedCylinderDlg.h AdvancedGUI_DividedCylinderDlg.cxx -ADVANCED_SOURCES += AdvancedGUI_SmoothingSurfaceDlg.h AdvancedGUI_SmoothingSurfaceDlg.cxx -##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## - -dist_libAdvancedGUI_la_SOURCES += $(ADVANCED_SOURCES) - -MOC_FILES = - -ADVANCED_MOC_FILES = -ADVANCED_MOC_FILES += AdvancedGUI_PipeTShapeDlg_moc.cxx -ADVANCED_MOC_FILES += AdvancedGUI_DividedDiskDlg_moc.cxx -ADVANCED_MOC_FILES += AdvancedGUI_DividedCylinderDlg_moc.cxx -ADVANCED_MOC_FILES += AdvancedGUI_SmoothingSurfaceDlg_moc.cxx -##@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@## - -MOC_FILES += $(ADVANCED_MOC_FILES) - -nodist_libAdvancedGUI_la_SOURCES = \ - $(MOC_FILES) - -# resources files -nodist_salomeres_DATA = \ - AdvancedGUI_images.qm \ - AdvancedGUI_msg_en.qm \ - AdvancedGUI_msg_fr.qm \ - AdvancedGUI_msg_ja.qm - -# additional information to compile and link file - -libAdvancedGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libAdvancedGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la \ - ../GEOMGUI/libGEOM.la \ - $(CAS_LDFLAGS) -lTKGeomBase \ - $(GUI_LDFLAGS) -lsuit diff --git a/src/IGESExport/Makefile.am b/src/BREPExport/CMakeLists.txt old mode 100644 new mode 100755 similarity index 54% rename from src/IGESExport/Makefile.am rename to src/BREPExport/CMakeLists.txt index efbd56277..db6f49ff7 --- a/src/IGESExport/Makefile.am +++ b/src/BREPExport/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,26 +17,35 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Pavel TELKOV -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKBRep} + ${KERNEL_SALOMELocalTrace} + ) + +# --- sources --- -# Libraries targets -lib_LTLIBRARIES = libIGESExport.la +SET(BREPExport_SOURCES + BREPExport.cxx + ) -dist_libIGESExport_la_SOURCES = \ - IGESExport.cxx +# --- rules --- -# additional information to compile and link file +ADD_LIBRARY(BREPExport ${BREPExport_SOURCES}) +TARGET_LINK_LIBRARIES(BREPExport ${_link_LIBRARIES}) +INSTALL(TARGETS BREPExport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -libIGESExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) -libIGESExport_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKIGES \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics diff --git a/src/BREPExport/Makefile.am b/src/BREPExport/Makefile.am deleted file mode 100644 index 14c49dfab..000000000 --- a/src/BREPExport/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 : Pavel TELKOV -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libBREPExport.la - -# Sources files -dist_libBREPExport_la_SOURCES = \ - BREPExport.cxx - -# additional information to compile and link file - -libBREPExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -libBREPExport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKBRep diff --git a/src/IGESImport/Makefile.am b/src/BREPImport/CMakeLists.txt old mode 100644 new mode 100755 similarity index 54% rename from src/IGESImport/Makefile.am rename to src/BREPImport/CMakeLists.txt index ea9e6b01b..b288b6877 --- a/src/IGESImport/Makefile.am +++ b/src/BREPImport/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -16,26 +16,36 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Pavel TELKOV -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- options --- -# Libraries targets -lib_LTLIBRARIES = libIGESImport.la +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) -dist_libIGESImport_la_SOURCES = \ - IGESImport.cxx +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) -# additional information to compile and link file +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKBRep} + ${KERNEL_SALOMELocalTrace} + ) + +# --- sources --- + +SET(BREPImport_SOURCES + BREPImport.cxx + ) + +# --- rules --- + +ADD_LIBRARY(BREPImport ${BREPImport_SOURCES}) +TARGET_LINK_LIBRARIES(BREPImport ${_link_LIBRARIES}) +INSTALL(TARGETS BREPImport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -libIGESImport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) -libIGESImport_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKIGES -lTKCAF -lTKLCAF \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics diff --git a/src/BREPImport/Makefile.am b/src/BREPImport/Makefile.am deleted file mode 100644 index c3349b39a..000000000 --- a/src/BREPImport/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 : Pavel TELKOV -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libBREPImport.la - -# Sources files -dist_libBREPImport_la_SOURCES = \ - BREPImport.cxx - -# additional information to compile and link file - -libBREPImport_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) - -libBREPImport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(CAS_LDPATH) -lTKBRep \ - $(STDLIB) diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt new file mode 100755 index 000000000..183950969 --- /dev/null +++ b/src/BasicGUI/CMakeLists.txt @@ -0,0 +1,115 @@ +# 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(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOM + GEOMBase + DlgRef + ) + +# --- headers --- + +SET(BasicGUI_HEADERS + BasicGUI.h + BasicGUI_ArcDlg.h + BasicGUI_CircleDlg.h + BasicGUI_CurveDlg.h + BasicGUI_EllipseDlg.h + BasicGUI_LineDlg.h + BasicGUI_MarkerDlg.h + BasicGUI_PlaneDlg.h + BasicGUI_PointDlg.h + BasicGUI_VectorDlg.h + BasicGUI_ParamCurveWidget.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + BasicGUI_PointDlg.h + BasicGUI_LineDlg.h + BasicGUI_CircleDlg.h + BasicGUI_EllipseDlg.h + BasicGUI_ArcDlg.h + BasicGUI_VectorDlg.h + BasicGUI_PlaneDlg.h + BasicGUI_CurveDlg.h + BasicGUI_MarkerDlg.h + BasicGUI_ParamCurveWidget.h + ) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(BasicGUI_SOURCES + BasicGUI.cxx + BasicGUI_PointDlg.cxx + BasicGUI_LineDlg.cxx + BasicGUI_CircleDlg.cxx + BasicGUI_EllipseDlg.cxx + BasicGUI_ArcDlg.cxx + BasicGUI_VectorDlg.cxx + BasicGUI_PlaneDlg.cxx + BasicGUI_CurveDlg.cxx + BasicGUI_MarkerDlg.cxx + BasicGUI_ParamCurveWidget.cxx + ${_moc_SOURCES} + ) + +# --- rules --- + +ADD_LIBRARY(BasicGUI ${BasicGUI_SOURCES}) +TARGET_LINK_LIBRARIES(BasicGUI ${_link_LIBRARIES}) +INSTALL(TARGETS BasicGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am deleted file mode 100644 index 1d680c9e2..000000000 --- a/src/BasicGUI/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : BasicGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files - - -salomeinclude_HEADERS = \ - BasicGUI.h \ - BasicGUI_ArcDlg.h \ - BasicGUI_CircleDlg.h \ - BasicGUI_CurveDlg.h \ - BasicGUI_EllipseDlg.h \ - BasicGUI_LineDlg.h \ - BasicGUI_MarkerDlg.h \ - BasicGUI_PlaneDlg.h \ - BasicGUI_PointDlg.h \ - BasicGUI_VectorDlg.h \ - BasicGUI_ParamCurveWidget.h -# -# OBSOLETE: BasicGUI_WorkingPlaneDlg.h -# - -# Libraries targets - -lib_LTLIBRARIES = libBasicGUI.la - -# Sources files -dist_libBasicGUI_la_SOURCES = \ - BasicGUI.cxx \ - BasicGUI_PointDlg.cxx \ - BasicGUI_LineDlg.cxx \ - BasicGUI_CircleDlg.cxx \ - BasicGUI_EllipseDlg.cxx \ - BasicGUI_ArcDlg.cxx \ - BasicGUI_VectorDlg.cxx \ - BasicGUI_PlaneDlg.cxx \ - BasicGUI_CurveDlg.cxx \ - BasicGUI_MarkerDlg.cxx \ - BasicGUI_ParamCurveWidget.cxx -# -# OBSOLETE: BasicGUI_WorkingPlaneDlg.cxx -# - -MOC_FILES = \ - BasicGUI_PointDlg_moc.cxx \ - BasicGUI_LineDlg_moc.cxx \ - BasicGUI_CircleDlg_moc.cxx \ - BasicGUI_EllipseDlg_moc.cxx \ - BasicGUI_ArcDlg_moc.cxx \ - BasicGUI_VectorDlg_moc.cxx \ - BasicGUI_PlaneDlg_moc.cxx \ - BasicGUI_CurveDlg_moc.cxx \ - BasicGUI_MarkerDlg_moc.cxx \ - BasicGUI_ParamCurveWidget_moc.cxx -# -# OBSOLETE: BasicGUI_WorkingPlaneDlg_moc.cxx -# - -nodist_libBasicGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libBasicGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(OPENCV_INCLUDES) \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMClient \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - - -libBasicGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la \ - ../GEOMGUI/libGEOM.la \ - $(CAS_LDFLAGS) -lTKGeomBase \ - $(GUI_LDFLAGS) -lsuit \ - $(OPENCV_LIBS) diff --git a/src/BlockFix/CMakeLists.txt b/src/BlockFix/CMakeLists.txt new file mode 100755 index 000000000..b63980fbf --- /dev/null +++ b/src/BlockFix/CMakeLists.txt @@ -0,0 +1,73 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} + ${CAS_TKOffset} ${CAS_TKBool} ${CAS_BO} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(BlockFix_HEADERS + BlockFix.hxx + BlockFix_BlockFixAPI.hxx + BlockFix_CheckTool.hxx + BlockFix_PeriodicSurfaceModifier.hxx + BlockFix_SphereSpaceModifier.hxx + BlockFix_UnionEdges.hxx + BlockFix_UnionFaces.hxx + ) + +# --- sources --- + +SET(BlockFix_SOURCES + BlockFix_BlockFixAPI.cxx + BlockFix_CheckTool.cxx + BlockFix.cxx + BlockFix_PeriodicSurfaceModifier.cxx + BlockFix_SphereSpaceModifier.cxx + BlockFix_UnionEdges.cxx + BlockFix_UnionFaces.cxx + ) + +# --- rules --- + +ADD_LIBRARY(BlockFix ${BlockFix_SOURCES}) +TARGET_LINK_LIBRARIES(BlockFix ${_link_LIBRARIES}) +INSTALL(TARGETS BlockFix EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${BlockFix_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + + diff --git a/src/BlockFix/Makefile.am b/src/BlockFix/Makefile.am deleted file mode 100644 index 16ecd1fc1..000000000 --- a/src/BlockFix/Makefile.am +++ /dev/null @@ -1,56 +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 -# - -# GEOM BlockFix : tools for Blocks algorithms -# File : Makefile.am -# Author : Julia DOROVSKIKH -# Module : GEOM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libBlockFix.la - -dist_libBlockFix_la_SOURCES = \ - BlockFix_BlockFixAPI.cxx \ - BlockFix_CheckTool.cxx \ - BlockFix.cxx \ - BlockFix_PeriodicSurfaceModifier.cxx \ - BlockFix_SphereSpaceModifier.cxx \ - BlockFix_UnionEdges.cxx \ - BlockFix_UnionFaces.cxx - -# header files -salomeinclude_HEADERS = \ - BlockFix.hxx \ - BlockFix_BlockFixAPI.hxx \ - BlockFix_CheckTool.hxx \ - BlockFix_PeriodicSurfaceModifier.hxx \ - BlockFix_SphereSpaceModifier.hxx \ - BlockFix_UnionEdges.hxx \ - BlockFix_UnionFaces.hxx - -libBlockFix_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -libBlockFix_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh -lTKOffset \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace diff --git a/src/BlocksGUI/CMakeLists.txt b/src/BlocksGUI/CMakeLists.txt new file mode 100755 index 000000000..dc0c705ee --- /dev/null +++ b/src/BlocksGUI/CMakeLists.txt @@ -0,0 +1,107 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# --- headers --- + +SET(BlocksGUI_HEADERS + BlocksGUI.h + BlocksGUI_QuadFaceDlg.h + BlocksGUI_BlockDlg.h + BlocksGUI_ExplodeDlg.h + BlocksGUI_PropagateDlg.h + BlocksGUI_TrsfDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + BlocksGUI_QuadFaceDlg.h + BlocksGUI_BlockDlg.h + BlocksGUI_ExplodeDlg.h + BlocksGUI_PropagateDlg.h + BlocksGUI_TrsfDlg.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(BlocksGUI_SOURCES + BlocksGUI.cxx + BlocksGUI_QuadFaceDlg.cxx + BlocksGUI_BlockDlg.cxx + BlocksGUI_ExplodeDlg.cxx + BlocksGUI_PropagateDlg.cxx + BlocksGUI_TrsfDlg.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(BlocksGUI ${BlocksGUI_SOURCES}) +TARGET_LINK_LIBRARIES(BlocksGUI ${_link_LIBRARIES}) +INSTALL(TARGETS BlocksGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/BlocksGUI/Makefile.am b/src/BlocksGUI/Makefile.am deleted file mode 100644 index 381217f31..000000000 --- a/src/BlocksGUI/Makefile.am +++ /dev/null @@ -1,85 +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 -# - -# GEOM BUILDGUI : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : BlockGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Headers files -salomeinclude_HEADERS = \ - BlocksGUI.h \ - BlocksGUI_QuadFaceDlg.h \ - BlocksGUI_BlockDlg.h \ - BlocksGUI_ExplodeDlg.h \ - BlocksGUI_PropagateDlg.h \ - BlocksGUI_TrsfDlg.h - -# Libraries targets -lib_LTLIBRARIES = libBlocksGUI.la - -# Sources files -dist_libBlocksGUI_la_SOURCES = \ - BlocksGUI.cxx \ - BlocksGUI_QuadFaceDlg.cxx \ - BlocksGUI_BlockDlg.cxx \ - BlocksGUI_ExplodeDlg.cxx \ - BlocksGUI_PropagateDlg.cxx \ - BlocksGUI_TrsfDlg.cxx - -MOC_FILES = \ - BlocksGUI_QuadFaceDlg_moc.cxx \ - BlocksGUI_BlockDlg_moc.cxx \ - BlocksGUI_ExplodeDlg_moc.cxx \ - BlocksGUI_PropagateDlg_moc.cxx \ - BlocksGUI_TrsfDlg_moc.cxx - -nodist_libBlocksGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libBlocksGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libBlocksGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../DlgRef/libDlgRef.la \ - ../GEOMBase/libGEOMBase.la \ - ../GEOMGUI/libGEOM.la \ - $(QT_MT_LIBS) diff --git a/src/BooleanGUI/CMakeLists.txt b/src/BooleanGUI/CMakeLists.txt new file mode 100755 index 000000000..c604eb0e2 --- /dev/null +++ b/src/BooleanGUI/CMakeLists.txt @@ -0,0 +1,95 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# --- headers --- + +SET(BooleanGUI_HEADERS + BooleanGUI.h + BooleanGUI_Dialog.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + BooleanGUI_Dialog.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(BooleanGUI_SOURCES + BooleanGUI.cxx + BooleanGUI_Dialog.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(BooleanGUI ${BooleanGUI_SOURCES}) +TARGET_LINK_LIBRARIES(BooleanGUI ${_link_LIBRARIES}) +INSTALL(TARGETS BooleanGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/BooleanGUI/Makefile.am b/src/BooleanGUI/Makefile.am deleted file mode 100644 index 91f11a877..000000000 --- a/src/BooleanGUI/Makefile.am +++ /dev/null @@ -1,72 +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 -# - -# GEOM BOOLEANGUI : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : BooleanGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - BooleanGUI.h \ - BooleanGUI_Dialog.h - -# Libraries targets -lib_LTLIBRARIES = libBooleanGUI.la - -# Sources files -dist_libBooleanGUI_la_SOURCES = \ - BooleanGUI.h \ - BooleanGUI_Dialog.h \ - \ - BooleanGUI.cxx \ - BooleanGUI_Dialog.cxx - -MOC_FILES = \ - BooleanGUI_Dialog_moc.cxx - -nodist_libBooleanGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libBooleanGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libBooleanGUI_la_LDFLAGS = \ - ../GEOMBase/libGEOMBase.la diff --git a/src/BuildGUI/CMakeLists.txt b/src/BuildGUI/CMakeLists.txt new file mode 100755 index 000000000..eaa4d3a66 --- /dev/null +++ b/src/BuildGUI/CMakeLists.txt @@ -0,0 +1,115 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOMBase + GEOM + DlgRef + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# --- headers --- + +SET(BuildGUI_HEADERS + BuildGUI.h + BuildGUI_EdgeDlg.h + BuildGUI_WireDlg.h + BuildGUI_FaceDlg.h + BuildGUI_ShellDlg.h + BuildGUI_SolidDlg.h + BuildGUI_CompoundDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + BuildGUI_EdgeDlg.h + BuildGUI_WireDlg.h + BuildGUI_FaceDlg.h + BuildGUI_ShellDlg.h + BuildGUI_SolidDlg.h + BuildGUI_CompoundDlg.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(BuildGUI_SOURCES + BuildGUI.cxx + BuildGUI_EdgeDlg.cxx + BuildGUI_WireDlg.cxx + BuildGUI_FaceDlg.cxx + BuildGUI_ShellDlg.cxx + BuildGUI_SolidDlg.cxx + BuildGUI_CompoundDlg.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(BuildGUI ${BuildGUI_SOURCES}) +TARGET_LINK_LIBRARIES(BuildGUI ${_link_LIBRARIES}) +INSTALL(TARGETS BuildGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/BuildGUI/Makefile.am b/src/BuildGUI/Makefile.am deleted file mode 100644 index 95fc4c37d..000000000 --- a/src/BuildGUI/Makefile.am +++ /dev/null @@ -1,85 +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 -# - -# GEOM BUILDGUI : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : BuildGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - BuildGUI.h \ - BuildGUI_EdgeDlg.h \ - BuildGUI_WireDlg.h \ - BuildGUI_FaceDlg.h \ - BuildGUI_ShellDlg.h \ - BuildGUI_SolidDlg.h \ - BuildGUI_CompoundDlg.h - -# Libraries targets -lib_LTLIBRARIES = libBuildGUI.la - -# Sources files -dist_libBuildGUI_la_SOURCES = \ - BuildGUI.cxx \ - BuildGUI_EdgeDlg.cxx \ - BuildGUI_WireDlg.cxx \ - BuildGUI_FaceDlg.cxx \ - BuildGUI_ShellDlg.cxx \ - BuildGUI_SolidDlg.cxx \ - BuildGUI_CompoundDlg.cxx - -MOC_FILES = \ - BuildGUI_EdgeDlg_moc.cxx \ - BuildGUI_WireDlg_moc.cxx \ - BuildGUI_FaceDlg_moc.cxx \ - BuildGUI_ShellDlg_moc.cxx \ - BuildGUI_SolidDlg_moc.cxx \ - BuildGUI_CompoundDlg_moc.cxx - -nodist_libBuildGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libBuildGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/idl \ - -I$(top_builddir)/src/DlgRef - -libBuildGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100755 index 000000000..17904ee59 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,59 @@ +# 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 + ARCHIMEDE NMTDS NMTTools BlockFix GEOMAlgo SKETCHER OCC2VTK GEOM BREPExport + BREPImport IGESExport IGESImport STEPExport STEPImport STLExport VTKExport + ShHealOper GEOMUtils GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY + ) + +## +# OPENCV +## +IF(SALOME_GEOM_USE_OPENCV) + SET(SUBDIRS_OPENCV + ShapeRecognition + ) +ENDIF() + +## +# GUI +## +IF(SALOME_GEOM_USE_GUI) + SET(SUBDIRS_GUI + OBJECT DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase + GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI + EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI + RepairGUI MeasureGUI GroupGUI BlocksGUI AdvancedGUI AdvancedEngine + GEOM_SWIG_WITHIHM + ) +ENDIF() + +SET(SUBDIRS + ${SUBDIRS_COMMON} + ${SUBDIRS_OPENCV} + ${SUBDIRS_GUI} +) + +FOREACH(dir ${SUBDIRS}) + ADD_SUBDIRECTORY(${dir}) +ENDFOREACH(dir ${SUBDIRS}) diff --git a/src/DisplayGUI/CMakeLists.txt b/src/DisplayGUI/CMakeLists.txt new file mode 100755 index 000000000..4014d9ee4 --- /dev/null +++ b/src/DisplayGUI/CMakeLists.txt @@ -0,0 +1,73 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOM + ) + +# --- headers --- + +SET(DisplayGUI_HEADERS + DisplayGUI.h + ) + +# --- sources --- + +SET(DisplayGUI_SOURCES + DisplayGUI.cxx + ) + +# --- rules --- + +ADD_LIBRARY(DisplayGUI ${DisplayGUI_SOURCES}) +TARGET_LINK_LIBRARIES(DisplayGUI ${_link_LIBRARIES}) +INSTALL(TARGETS DisplayGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/DisplayGUI/Makefile.am b/src/DisplayGUI/Makefile.am deleted file mode 100644 index d4f00dbd1..000000000 --- a/src/DisplayGUI/Makefile.am +++ /dev/null @@ -1,61 +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 -# - -# GEOM DISPLAYGUI : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : DisplayGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DisplayGUI.h - -# Libraries targets -lib_LTLIBRARIES = libDisplayGUI.la - -dist_libDisplayGUI_la_SOURCES = \ - DisplayGUI.h \ - DisplayGUI.cxx - -# additional information to compile and link file - -libDisplayGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMClient \ - -I$(top_builddir)/idl - -libDisplayGUI_la_LDFLAGS = \ - ../GEOMGUI/libGEOM.la \ - $(GUI_LDFLAGS) -lsuit -lSVTK \ - -lSOCC -lSalomePrs -lSalomeApp \ - $(VTK_LIBS) \ - $(QT_MT_LIBS) diff --git a/src/DlgRef/CMakeLists.txt b/src/DlgRef/CMakeLists.txt new file mode 100755 index 000000000..0355bb2ac --- /dev/null +++ b/src/DlgRef/CMakeLists.txt @@ -0,0 +1,126 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseQt4Ext) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${CMAKE_CURRENT_BINARY_DIR} + ${GUI_INCLUDE_DIRS} +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${QT_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${QT_LIBRARIES} + ${GUI_SalomeApp} + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + DlgRef_1Check1Spin1Check_QTD.ui + DlgRef_1List1Spin1Btn_QTD.ui + DlgRef_1Sel1Check1List_QTD.ui + DlgRef_1Sel1Check1Sel_QTD.ui + DlgRef_1Sel1Check_QTD.ui + DlgRef_1Sel1Frame_QTD.ui + DlgRef_1Sel1List1Check3Btn_QTD.ui + DlgRef_1Sel1Spin1Check_QTD.ui + DlgRef_1Sel1Spin_QTD.ui + DlgRef_1Sel2Spin1View1Check_QTD.ui + DlgRef_1Sel2Spin_QTD.ui + DlgRef_1Sel3Check_QTD.ui + DlgRef_1Sel3Spin1Check_QTD.ui + DlgRef_1Sel3Spin2Check1Spin_QTD.ui + DlgRef_1Sel3Spin_QTD.ui + DlgRef_1Sel5Spin1Check_QTD.ui + DlgRef_1SelExt_QTD.ui + DlgRef_1Sel_QTD.ui + DlgRef_1Spin_QTD.ui + DlgRef_2Sel1List1Check_QTD.ui + DlgRef_2Sel1List2Check_QTD.ui + DlgRef_2Sel1List_QTD.ui + DlgRef_2Sel1Spin2Check_QTD.ui + DlgRef_2Sel1Spin3Check1Spin_QTD.ui + DlgRef_2Sel1SpinInt_QTD.ui + DlgRef_2Sel1Spin_QTD.ui + DlgRef_2Sel2List_QTD.ui + DlgRef_2Sel2Spin1Check_QTD.ui + DlgRef_2Sel2Spin1Push_QTD.ui + DlgRef_2Sel2Spin2Push_QTD.ui + DlgRef_2Sel2Spin3Check_QTD.ui + DlgRef_2Sel2Spin_QTD.ui + DlgRef_2Sel3Spin2Rb_QTD.ui + DlgRef_2Sel3Spin_QTD.ui + DlgRef_2SelExt_QTD.ui + DlgRef_2Sel_QTD.ui + DlgRef_2Spin_QTD.ui + DlgRef_3Check_QTD.ui + DlgRef_3Radio1Sel1Spin_QTD.ui + DlgRef_3Radio_QTD.ui + DlgRef_3Sel1Check_QTD.ui + DlgRef_3Sel1Spin_QTD.ui + DlgRef_3Sel2Check3Spin_QTD.ui + DlgRef_3Sel2Spin_QTD.ui + DlgRef_3Sel3Spin1Check_QTD.ui + DlgRef_3Sel3Spin2Check_QTD.ui + DlgRef_3Sel4Spin2Check_QTD.ui + DlgRef_3Sel_QTD.ui + DlgRef_3Spin1Check_QTD.ui + DlgRef_3Spin_QTD.ui + DlgRef_4Sel1List1Check_QTD.ui + DlgRef_4Sel1List_QTD.ui + DlgRef_4Sel1Spin2Check_QTD.ui + DlgRef_4Sel1Spin3Check_QTD.ui + DlgRef_4Spin_QTD.ui + DlgRef_6Sel_QTD.ui + DlgRef_Skeleton_QTD.ui + ) + +# --- headers --- + +# header files / to be processed by moc +SET(_moc_HEADERS DlgRef.h) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +# sources / to compile +SET(DlgRef_SOURCES DlgRef.cxx ${_moc_SOURCES} ${_uic_HEADERS}) + +# --- rules --- + +ADD_LIBRARY(DlgRef ${DlgRef_SOURCES}) +TARGET_LINK_LIBRARIES(DlgRef ${_link_LIBRARIES}) + +INSTALL(TARGETS DlgRef EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am deleted file mode 100644 index baf6b899a..000000000 --- a/src/DlgRef/Makefile.am +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : DlgRef - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libDlgRef.la - -# Sources files -dist_libDlgRef_la_SOURCES = \ - DlgRef.h \ - DlgRef.cxx - -MOC_FILES = \ - DlgRef_moc.cxx - -UIC_FILES = \ - ui_DlgRef_1Check1Spin1Check_QTD.h \ - ui_DlgRef_1List1Spin1Btn_QTD.h \ - ui_DlgRef_1Sel1Check1List_QTD.h \ - ui_DlgRef_1Sel1Check1Sel_QTD.h \ - ui_DlgRef_1Sel1Check_QTD.h \ - ui_DlgRef_1Sel1Frame_QTD.h \ - ui_DlgRef_1Sel1List1Check3Btn_QTD.h \ - ui_DlgRef_1Sel1Spin1Check_QTD.h \ - ui_DlgRef_1Sel1Spin_QTD.h \ - ui_DlgRef_1Sel2Spin1View1Check_QTD.h \ - ui_DlgRef_1Sel2Spin_QTD.h \ - ui_DlgRef_1Sel3Check_QTD.h \ - ui_DlgRef_1Sel3Spin_QTD.h \ - ui_DlgRef_1Sel3Spin1Check_QTD.h \ - ui_DlgRef_1Sel3Spin2Check1Spin_QTD.h \ - ui_DlgRef_1Sel5Spin1Check_QTD.h \ - ui_DlgRef_1Sel_QTD.h \ - ui_DlgRef_1SelExt_QTD.h \ - ui_DlgRef_1Spin_QTD.h \ - ui_DlgRef_2Sel1List1Check_QTD.h \ - ui_DlgRef_2Sel1List2Check_QTD.h \ - ui_DlgRef_2Sel1List_QTD.h \ - ui_DlgRef_2Sel1Spin2Check_QTD.h \ - ui_DlgRef_2Sel1Spin3Check1Spin_QTD.h \ - ui_DlgRef_2Sel1Spin_QTD.h \ - ui_DlgRef_2Sel1SpinInt_QTD.h \ - ui_DlgRef_2Sel2List_QTD.h \ - ui_DlgRef_2Sel2Spin1Check_QTD.h \ - ui_DlgRef_2Sel2Spin3Check_QTD.h \ - ui_DlgRef_2Sel2Spin_QTD.h \ - ui_DlgRef_2Sel2Spin1Push_QTD.h \ - ui_DlgRef_2Sel2Spin2Push_QTD.h \ - ui_DlgRef_2Sel3Spin2Rb_QTD.h \ - ui_DlgRef_2Sel3Spin_QTD.h \ - ui_DlgRef_2Sel_QTD.h \ - ui_DlgRef_2SelExt_QTD.h \ - ui_DlgRef_2Spin_QTD.h \ - ui_DlgRef_3Check_QTD.h \ - ui_DlgRef_3Radio_QTD.h \ - ui_DlgRef_3Radio1Sel1Spin_QTD.h \ - ui_DlgRef_3Sel1Check_QTD.h \ - ui_DlgRef_3Sel2Check3Spin_QTD.h \ - ui_DlgRef_3Sel1Spin_QTD.h \ - ui_DlgRef_3Sel2Spin_QTD.h \ - ui_DlgRef_3Sel3Spin1Check_QTD.h \ - ui_DlgRef_3Sel3Spin2Check_QTD.h \ - ui_DlgRef_3Sel4Spin2Check_QTD.h \ - ui_DlgRef_3Sel_QTD.h \ - ui_DlgRef_3Spin1Check_QTD.h \ - ui_DlgRef_3Spin_QTD.h \ - ui_DlgRef_4Sel1List1Check_QTD.h \ - ui_DlgRef_4Sel1List_QTD.h \ - ui_DlgRef_4Sel1Spin2Check_QTD.h \ - ui_DlgRef_4Sel1Spin3Check_QTD.h \ - ui_DlgRef_4Spin_QTD.h \ - ui_DlgRef_6Sel_QTD.h \ - ui_DlgRef_Skeleton_QTD.h - -ADVANCED_UIC_FILES = -##@@ insert new functions before this line @@ do not remove this line @@## - -UIC_FILES += $(ADVANCED_UIC_FILES) - -BUILT_SOURCES = $(UIC_FILES) - -nodist_libDlgRef_la_SOURCES = \ - $(MOC_FILES) \ - $(UIC_FILES) - -# additional information to compile and link file - -libDlgRef_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(GUI_CXXFLAGS) - -libDlgRef_la_LDFLAGS = \ - $(STDLIB) \ - $(QT_MT_LIBS) \ - $(GUI_LDFLAGS) -lqtx -lSalomeApp diff --git a/src/EntityGUI/CMakeLists.txt b/src/EntityGUI/CMakeLists.txt new file mode 100755 index 000000000..7bccc4ff9 --- /dev/null +++ b/src/EntityGUI/CMakeLists.txt @@ -0,0 +1,140 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/SKETCHER + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOMBase + GEOM + DlgRef + GEOMSketcher + ) + +# optional sources +IF(SALOME_GEOM_USE_OPENCV) + SET( FeatureDetectorDlg_Sources FeatureDetectorDlg.cxx ) + SET( FeatureDetectorDlg_moc_h EntityGUI_FeatureDetectorDlg.h ) +ENDIF() + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + EntityGUI_1Sel1Spin1Check_QTD.ui + EntityGUI_1Sel1Spin_QTD.ui + EntityGUI_1Sel_QTD.ui + EntityGUI_1Spin_QTD.ui + EntityGUI_2Sel1Check_QTD.ui + EntityGUI_2Spin_QTD.ui + EntityGUI_3Spin1Check_QTD.ui + EntityGUI_3Spin_QTD.ui + EntityGUI_4Spin1Check_QTD.ui + EntityGUI_4Spin_QTD.ui + EntityGUI_Angles_QTD.ui + EntityGUI_Controls_QTD.ui + EntityGUI_Dir1_QTD.ui + EntityGUI_Dir2_QTD.ui + EntityGUI_Point_QTD.ui + EntityGUI_Skeleton_QTD.ui + EntityGUI_Type_QTD.ui + ) + +# --- headers --- + +SET(EntityGUI_HEADERS + EntityGUI.h + EntityGUI_Widgets.h + EntityGUI_SketcherDlg.h + EntityGUI_3DSketcherDlg.h + EntityGUI_SubShapeDlg.h + EntityGUI_FeatureDetectorDlg.h + EntityGUI_PictureImportDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + EntityGUI_Widgets.h + EntityGUI_SketcherDlg.h + EntityGUI_3DSketcherDlg.h + EntityGUI_SubShapeDlg.h + EntityGUI_PictureImportDlg.h + ${FeatureDetectorDlg_moc_h} + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(EntityGUI_SOURCES + EntityGUI.cxx + EntityGUI_Widgets.cxx + EntityGUI_SketcherDlg.cxx + EntityGUI_3DSketcherDlg.cxx + EntityGUI_SubShapeDlg.cxx + EntityGUI_PictureImportDlg.cxx + ${FeatureDetectorDlg_Sources} + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(EntityGUI ${EntityGUI_SOURCES}) +TARGET_LINK_LIBRARIES(EntityGUI ${_link_LIBRARIES}) +INSTALL(TARGETS EntityGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am deleted file mode 100644 index 37f0e6f46..000000000 --- a/src/EntityGUI/Makefile.am +++ /dev/null @@ -1,129 +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 -# - -# GEOM ENTITYGUI : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : EntityGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if WITH_OPENCV - FeatureDetectorDlg_Header = EntityGUI_FeatureDetectorDlg.h - FeatureDetectorDlg_Sources = EntityGUI_FeatureDetectorDlg.cxx - FeatureDetectorDlg_moc = EntityGUI_FeatureDetectorDlg_moc.cxx - Opencv_libs = $(OPENCV_LIBS) - Opencv_includes = $(OPENCV_INCLUDES) - ShapeRec_dir = $(srcdir)/../ShapeRecognition - ShapeRec_la = ../ShapeRecognition/libGEOMShapeRec.la -endif - -PictureImportDlg_Header = EntityGUI_PictureImportDlg.h -PictureImportDlg_Sources = EntityGUI_PictureImportDlg.cxx -PictureImportDlg_moc = EntityGUI_PictureImportDlg_moc.cxx - -# Libraries targets -lib_LTLIBRARIES = libEntityGUI.la - -# header files -salomeinclude_HEADERS = \ - EntityGUI.h \ - EntityGUI_Widgets.h \ - EntityGUI_SketcherDlg.h \ - EntityGUI_3DSketcherDlg.h \ - EntityGUI_SubShapeDlg.h \ - $(FeatureDetectorDlg_Header) \ - $(PictureImportDlg_Header) - -dist_libEntityGUI_la_SOURCES = \ - EntityGUI.cxx \ - EntityGUI_Widgets.cxx \ - EntityGUI_SketcherDlg.cxx \ - EntityGUI_3DSketcherDlg.cxx \ - EntityGUI_SubShapeDlg.cxx \ - $(FeatureDetectorDlg_Sources) \ - $(PictureImportDlg_Sources) - -MOC_FILES = \ - EntityGUI_Widgets_moc.cxx \ - EntityGUI_SketcherDlg_moc.cxx \ - EntityGUI_3DSketcherDlg_moc.cxx \ - EntityGUI_SubShapeDlg_moc.cxx \ - $(FeatureDetectorDlg_moc) \ - $(PictureImportDlg_moc) - -nodist_libEntityGUI_la_SOURCES = \ - $(MOC_FILES) - -UIC_FILES = \ - ui_EntityGUI_1Sel_QTD.h \ - ui_EntityGUI_2Sel1Check_QTD.h \ - ui_EntityGUI_1Sel1Spin1Check_QTD.h \ - ui_EntityGUI_1Spin_QTD.h \ - ui_EntityGUI_2Spin_QTD.h \ - ui_EntityGUI_3Spin_QTD.h \ - ui_EntityGUI_4Spin_QTD.h \ - ui_EntityGUI_3Spin1Check_QTD.h \ - ui_EntityGUI_4Spin1Check_QTD.h \ - ui_EntityGUI_Dir1_QTD.h \ - ui_EntityGUI_Dir2_QTD.h \ - ui_EntityGUI_Point_QTD.h \ - ui_EntityGUI_Skeleton_QTD.h \ - ui_EntityGUI_Type_QTD.h \ - ui_EntityGUI_Angles_QTD.h \ - ui_EntityGUI_Controls_QTD.h - -BUILT_SOURCES = $(UIC_FILES) - -# additional information to compile and link file - -libEntityGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(Opencv_includes) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(srcdir)/../SKETCHER \ - -I$(ShapeRec_dir) \ - -I$(srcdir)/../GEOM \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - - -libEntityGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la \ - ../SKETCHER/libGEOMSketcher.la \ - ../GEOMGUI/libGEOM.la \ - $(ShapeRec_la) \ - $(QT_MT_LIBS) \ - $(CAS_TKTopAlgo) -lTKernel \ - $(Opencv_libs) diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt new file mode 100755 index 000000000..c5bbf9823 --- /dev/null +++ b/src/GEOM/CMakeLists.txt @@ -0,0 +1,89 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/SKETCHER + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_OCAFVIS} + ${KERNEL_SALOMELocalTrace} + GEOMSketcher + ) + +# --- headers --- + +SET(GEOM_HEADERS + GEOM_Application.hxx + GEOM_Application.ixx + GEOM_Application.jxx + Handle_GEOM_Application.hxx + GEOM_Engine.hxx + GEOM_Function.hxx + GEOM_Object.hxx + GEOM_BaseDriver.hxx + GEOM_SubShapeDriver.hxx + GEOM_IOperations.hxx + GEOM_ISubShape.hxx + GEOM_Solver.hxx + GEOM_PythonDump.hxx + GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx + GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx + GEOM_DataMapOfAsciiStringTransient.hxx + Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx + ) + +# --- sources --- + +SET(GEOM_SOURCES + GEOM_Application.cxx + GEOM_Engine.cxx + GEOM_Function.cxx + GEOM_Object.cxx + GEOM_IOperations.cxx + GEOM_Solver.cxx + GEOM_BaseDriver.cxx + GEOM_SubShapeDriver.cxx + GEOM_PythonDump.cxx + GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx + GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx + GEOM_DataMapOfAsciiStringTransient_0.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMbasic ${GEOM_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMbasic ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMbasic EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOM_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + + diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 478c154bd..30c9b449c 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -160,8 +160,8 @@ void PublishObject (TObjectData& theObjectData, //================================================================================ void GEOM_Engine::healPyName( TCollection_AsciiString& pyName, - const TCollection_AsciiString& anEntry, - Resource_DataMapOfAsciiStringAsciiString& aNameToEntry) + const TCollection_AsciiString& anEntry, + Resource_DataMapOfAsciiStringAsciiString& aNameToEntry) { const TCollection_AsciiString allowedChars ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"); diff --git a/src/GEOM/Makefile.am b/src/GEOM/Makefile.am deleted file mode 100644 index 1ad106618..000000000 --- a/src/GEOM/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 -# - -# File : Makefile.in -# Author : Damien COQUERET (OCC) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets - -lib_LTLIBRARIES = libGEOMbasic.la - -dist_libGEOMbasic_la_SOURCES = \ - GEOM_Application.cxx \ - GEOM_Engine.cxx \ - GEOM_Function.cxx \ - GEOM_Object.cxx \ - GEOM_IOperations.cxx \ - GEOM_Solver.cxx \ - GEOM_BaseDriver.cxx \ - GEOM_SubShapeDriver.cxx \ - GEOM_PythonDump.cxx \ - GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx \ - GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx \ - GEOM_DataMapOfAsciiStringTransient_0.cxx - -# header files -salomeinclude_HEADERS = \ - GEOM_Application.hxx \ - GEOM_Application.ixx \ - GEOM_Application.jxx \ - Handle_GEOM_Application.hxx \ - GEOM_Engine.hxx \ - GEOM_Function.hxx \ - GEOM_Object.hxx \ - GEOM_BaseDriver.hxx \ - GEOM_SubShapeDriver.hxx \ - GEOM_IOperations.hxx \ - GEOM_ISubShape.hxx \ - GEOM_Solver.hxx \ - GEOM_PythonDump.hxx \ - GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx \ - GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx \ - GEOM_DataMapOfAsciiStringTransient.hxx \ - Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx - -# additional information to compile and link file - -libGEOMbasic_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../SKETCHER \ - -I$(top_builddir)/idl - -libGEOMbasic_la_LDFLAGS = \ - ../SKETCHER/libGEOMSketcher.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKXSBase -lTKG3d \ - $(CAS_OCAF) \ - $(CAS_OCAFVIS) diff --git a/src/GEOMAlgo/CMakeLists.txt b/src/GEOMAlgo/CMakeLists.txt new file mode 100755 index 000000000..4e7266286 --- /dev/null +++ b/src/GEOMAlgo/CMakeLists.txt @@ -0,0 +1,197 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/NMTTools + ${PROJECT_SOURCE_DIR}/src/NMTDS + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} ${CAS_TKBool} ${CAS_BO} ${CAS_TKMesh} + ${KERNEL_SALOMELocalTrace} + NMTTools NMTDS + ) + +# --- headers --- + +SET(GEOMAlgo_HEADERS + GEOMAlgo_Algo.hxx + GEOMAlgo_BuilderArea.hxx + GEOMAlgo_BuilderFace.hxx + GEOMAlgo_Builder.hxx + GEOMAlgo_BuilderShape.hxx + GEOMAlgo_BuilderSolid.hxx + GEOMAlgo_BuilderTools.hxx + GEOMAlgo_ClsfBox.hxx + GEOMAlgo_Clsf.hxx + GEOMAlgo_ClsfSolid.hxx + GEOMAlgo_ClsfSurf.hxx + GEOMAlgo_CoupleOfShapes.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx + GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx + GEOMAlgo_DataMapOfOrientedShapeShape.hxx + GEOMAlgo_DataMapOfPassKeyInteger.hxx + GEOMAlgo_DataMapOfPassKeyShapeShape.hxx + GEOMAlgo_DataMapOfRealListOfShape.hxx + GEOMAlgo_DataMapOfShapeMapOfShape.hxx + GEOMAlgo_DataMapOfShapePnt.hxx + GEOMAlgo_DataMapOfShapeReal.hxx + GEOMAlgo_DataMapOfShapeShapeSet.hxx + GEOMAlgo_FinderShapeOn1.hxx + GEOMAlgo_FinderShapeOn2.hxx + GEOMAlgo_FinderShapeOn.hxx + GEOMAlgo_FinderShapeOnQuad.hxx + GEOMAlgo_GetInPlace.hxx + GEOMAlgo_GlueAnalyser.hxx + GEOMAlgo_GlueDetector.hxx + GEOMAlgo_Gluer2.hxx + GEOMAlgo_GluerAlgo.hxx + GEOMAlgo_Gluer.hxx + GEOMAlgo_HAlgo.hxx + GEOMAlgo_IndexedDataMapOfIntegerShape.hxx + GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx + GEOMAlgo_IndexedDataMapOfShapeBox.hxx + GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx + GEOMAlgo_IndexedDataMapOfShapeState.hxx + GEOMAlgo_KindOfBounds.hxx + GEOMAlgo_KindOfClosed.hxx + GEOMAlgo_KindOfName.hxx + GEOMAlgo_KindOfShape.hxx + GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx + GEOMAlgo_ListIteratorOfListOfPnt.hxx + GEOMAlgo_ListOfCoupleOfShapes.hxx + GEOMAlgo_ListOfPnt.hxx + GEOMAlgo_PassKey.hxx + GEOMAlgo_PassKeyMapHasher.hxx + GEOMAlgo_PassKeyShape.hxx + GEOMAlgo_PassKeyShapeMapHasher.hxx + GEOMAlgo_PWireEdgeSet.hxx + GEOMAlgo_RemoverWebs.hxx + GEOMAlgo_ShapeAlgo.hxx + GEOMAlgo_ShapeInfo.hxx + GEOMAlgo_ShapeInfoFiller.hxx + GEOMAlgo_ShapeSet.hxx + GEOMAlgo_ShapeSolid.hxx + GEOMAlgo_ShellSolid.hxx + GEOMAlgo_SolidSolid.hxx + GEOMAlgo_Splitter.hxx + GEOMAlgo_StateCollector.hxx + GEOMAlgo_State.hxx + GEOMAlgo_SurfaceTools.hxx + GEOMAlgo_Tools3D.hxx + GEOMAlgo_Tools.hxx + GEOMAlgo_VertexSolid.hxx + GEOMAlgo_WESCorrector.hxx + GEOMAlgo_WESScaler.hxx + GEOMAlgo_WireEdgeSet.hxx + GEOMAlgo_WireSolid.hxx + GEOMAlgo_WireSplitter.hxx + ) + +# --- sources --- + +SET(GEOMAlgo_SOURCES + GEOMAlgo_Algo.cxx + GEOMAlgo_Builder_0.cxx + GEOMAlgo_Builder_1.cxx + GEOMAlgo_Builder_2.cxx + GEOMAlgo_Builder_3.cxx + GEOMAlgo_Builder_4.cxx + GEOMAlgo_BuilderArea.cxx + GEOMAlgo_Builder.cxx + GEOMAlgo_BuilderFace.cxx + GEOMAlgo_BuilderShape.cxx + GEOMAlgo_BuilderSolid.cxx + GEOMAlgo_BuilderTools.cxx + GEOMAlgo_ClsfBox.cxx + GEOMAlgo_Clsf.cxx + GEOMAlgo_ClsfSolid.cxx + GEOMAlgo_ClsfSurf.cxx + GEOMAlgo_CoupleOfShapes.cxx + GEOMAlgo_FinderShapeOn1.cxx + GEOMAlgo_FinderShapeOn2.cxx + GEOMAlgo_FinderShapeOn.cxx + GEOMAlgo_FinderShapeOnQuad.cxx + GEOMAlgo_GetInPlace_1.cxx + GEOMAlgo_GetInPlace_2.cxx + GEOMAlgo_GetInPlace_3.cxx + GEOMAlgo_GetInPlace.cxx + GEOMAlgo_GlueAnalyser.cxx + GEOMAlgo_GlueDetector.cxx + GEOMAlgo_Gluer2_1.cxx + GEOMAlgo_Gluer2_2.cxx + GEOMAlgo_Gluer2_3.cxx + GEOMAlgo_Gluer2.cxx + GEOMAlgo_GluerAlgo.cxx + GEOMAlgo_Gluer.cxx + GEOMAlgo_HAlgo.cxx + GEOMAlgo_PassKey.cxx + GEOMAlgo_PassKeyMapHasher.cxx + GEOMAlgo_PassKeyShape.cxx + GEOMAlgo_PassKeyShapeMapHasher.cxx + GEOMAlgo_RemoverWebs.cxx + GEOMAlgo_ShapeAlgo.cxx + GEOMAlgo_ShapeInfo.cxx + GEOMAlgo_ShapeInfoFiller_1.cxx + GEOMAlgo_ShapeInfoFiller.cxx + GEOMAlgo_ShapeSet.cxx + GEOMAlgo_ShapeSolid.cxx + GEOMAlgo_ShellSolid.cxx + GEOMAlgo_SolidSolid.cxx + GEOMAlgo_Splitter.cxx + GEOMAlgo_StateCollector.cxx + GEOMAlgo_SurfaceTools.cxx + GEOMAlgo_Tools_1.cxx + GEOMAlgo_Tools3D.cxx + GEOMAlgo_Tools.cxx + GEOMAlgo_VertexSolid.cxx + GEOMAlgo_WESCorrector.cxx + GEOMAlgo_WESScaler.cxx + GEOMAlgo_WireEdgeSet.cxx + GEOMAlgo_WireSolid.cxx + GEOMAlgo_WireSplitter.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMAlgo ${GEOMAlgo_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMAlgo ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMAlgo EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMAlgo_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + + diff --git a/src/GEOMAlgo/Makefile.am b/src/GEOMAlgo/Makefile.am deleted file mode 100644 index 48d86cf34..000000000 --- a/src/GEOMAlgo/Makefile.am +++ /dev/null @@ -1,188 +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 -# - -# GEOM GEOMAlgo : tools for Glue Faces algorithm -# File : Makefile.am -# Author : Julia DOROVSKIKH -# Module : GEOM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOMAlgo.la - -dist_libGEOMAlgo_la_SOURCES = \ - GEOMAlgo_Algo.cxx \ - GEOMAlgo_Builder_0.cxx \ - GEOMAlgo_Builder_1.cxx \ - GEOMAlgo_Builder_2.cxx \ - GEOMAlgo_Builder_3.cxx \ - GEOMAlgo_Builder_4.cxx \ - GEOMAlgo_BuilderArea.cxx \ - GEOMAlgo_Builder.cxx \ - GEOMAlgo_BuilderFace.cxx \ - GEOMAlgo_BuilderShape.cxx \ - GEOMAlgo_BuilderSolid.cxx \ - GEOMAlgo_BuilderTools.cxx \ - GEOMAlgo_ClsfBox.cxx \ - GEOMAlgo_Clsf.cxx \ - GEOMAlgo_ClsfSolid.cxx \ - GEOMAlgo_ClsfSurf.cxx \ - GEOMAlgo_CoupleOfShapes.cxx \ - GEOMAlgo_FinderShapeOn1.cxx \ - GEOMAlgo_FinderShapeOn2.cxx \ - GEOMAlgo_FinderShapeOn.cxx \ - GEOMAlgo_FinderShapeOnQuad.cxx \ - GEOMAlgo_GetInPlace_1.cxx \ - GEOMAlgo_GetInPlace_2.cxx \ - GEOMAlgo_GetInPlace_3.cxx \ - GEOMAlgo_GetInPlace.cxx \ - GEOMAlgo_GlueAnalyser.cxx \ - GEOMAlgo_GlueDetector.cxx \ - GEOMAlgo_Gluer2_1.cxx \ - GEOMAlgo_Gluer2_2.cxx \ - GEOMAlgo_Gluer2_3.cxx \ - GEOMAlgo_Gluer2.cxx \ - GEOMAlgo_GluerAlgo.cxx \ - GEOMAlgo_Gluer.cxx \ - GEOMAlgo_HAlgo.cxx \ - GEOMAlgo_PassKey.cxx \ - GEOMAlgo_PassKeyMapHasher.cxx \ - GEOMAlgo_PassKeyShape.cxx \ - GEOMAlgo_PassKeyShapeMapHasher.cxx \ - GEOMAlgo_RemoverWebs.cxx \ - GEOMAlgo_ShapeAlgo.cxx \ - GEOMAlgo_ShapeInfo.cxx \ - GEOMAlgo_ShapeInfoFiller_1.cxx \ - GEOMAlgo_ShapeInfoFiller.cxx \ - GEOMAlgo_ShapeSet.cxx \ - GEOMAlgo_ShapeSolid.cxx \ - GEOMAlgo_ShellSolid.cxx \ - GEOMAlgo_SolidSolid.cxx \ - GEOMAlgo_Splitter.cxx \ - GEOMAlgo_StateCollector.cxx \ - GEOMAlgo_SurfaceTools.cxx \ - GEOMAlgo_Tools_1.cxx \ - GEOMAlgo_Tools3D.cxx \ - GEOMAlgo_Tools.cxx \ - GEOMAlgo_VertexSolid.cxx \ - GEOMAlgo_WESCorrector.cxx \ - GEOMAlgo_WESScaler.cxx \ - GEOMAlgo_WireEdgeSet.cxx \ - GEOMAlgo_WireSolid.cxx \ - GEOMAlgo_WireSplitter.cxx - -# header files -salomeinclude_HEADERS = \ - GEOMAlgo_Algo.hxx \ - GEOMAlgo_BuilderArea.hxx \ - GEOMAlgo_BuilderFace.hxx \ - GEOMAlgo_Builder.hxx \ - GEOMAlgo_BuilderShape.hxx \ - GEOMAlgo_BuilderSolid.hxx \ - GEOMAlgo_BuilderTools.hxx \ - GEOMAlgo_ClsfBox.hxx \ - GEOMAlgo_Clsf.hxx \ - GEOMAlgo_ClsfSolid.hxx \ - GEOMAlgo_ClsfSurf.hxx \ - GEOMAlgo_CoupleOfShapes.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx \ - GEOMAlgo_DataMapOfOrientedShapeShape.hxx \ - GEOMAlgo_DataMapOfPassKeyInteger.hxx \ - GEOMAlgo_DataMapOfPassKeyShapeShape.hxx \ - GEOMAlgo_DataMapOfRealListOfShape.hxx \ - GEOMAlgo_DataMapOfShapeMapOfShape.hxx \ - GEOMAlgo_DataMapOfShapePnt.hxx \ - GEOMAlgo_DataMapOfShapeReal.hxx \ - GEOMAlgo_DataMapOfShapeShapeSet.hxx \ - GEOMAlgo_FinderShapeOn1.hxx \ - GEOMAlgo_FinderShapeOn2.hxx \ - GEOMAlgo_FinderShapeOn.hxx \ - GEOMAlgo_FinderShapeOnQuad.hxx \ - GEOMAlgo_GetInPlace.hxx \ - GEOMAlgo_GlueAnalyser.hxx \ - GEOMAlgo_GlueDetector.hxx \ - GEOMAlgo_Gluer2.hxx \ - GEOMAlgo_GluerAlgo.hxx \ - GEOMAlgo_Gluer.hxx \ - GEOMAlgo_HAlgo.hxx \ - GEOMAlgo_IndexedDataMapOfIntegerShape.hxx \ - GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx \ - GEOMAlgo_IndexedDataMapOfShapeBox.hxx \ - GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx \ - GEOMAlgo_IndexedDataMapOfShapeState.hxx \ - GEOMAlgo_KindOfBounds.hxx \ - GEOMAlgo_KindOfClosed.hxx \ - GEOMAlgo_KindOfName.hxx \ - GEOMAlgo_KindOfShape.hxx \ - GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx \ - GEOMAlgo_ListIteratorOfListOfPnt.hxx \ - GEOMAlgo_ListOfCoupleOfShapes.hxx \ - GEOMAlgo_ListOfPnt.hxx \ - GEOMAlgo_PassKey.hxx \ - GEOMAlgo_PassKeyMapHasher.hxx \ - GEOMAlgo_PassKeyShape.hxx \ - GEOMAlgo_PassKeyShapeMapHasher.hxx \ - GEOMAlgo_PWireEdgeSet.hxx \ - GEOMAlgo_RemoverWebs.hxx \ - GEOMAlgo_ShapeAlgo.hxx \ - GEOMAlgo_ShapeInfo.hxx \ - GEOMAlgo_ShapeInfoFiller.hxx \ - GEOMAlgo_ShapeSet.hxx \ - GEOMAlgo_ShapeSolid.hxx \ - GEOMAlgo_ShellSolid.hxx \ - GEOMAlgo_SolidSolid.hxx \ - GEOMAlgo_Splitter.hxx \ - GEOMAlgo_StateCollector.hxx \ - GEOMAlgo_State.hxx \ - GEOMAlgo_SurfaceTools.hxx \ - GEOMAlgo_Tools3D.hxx \ - GEOMAlgo_Tools.hxx \ - GEOMAlgo_VertexSolid.hxx \ - GEOMAlgo_WESCorrector.hxx \ - GEOMAlgo_WESScaler.hxx \ - GEOMAlgo_WireEdgeSet.hxx \ - GEOMAlgo_WireSolid.hxx \ - GEOMAlgo_WireSplitter.hxx - -libGEOMAlgo_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../NMTDS \ - -I$(srcdir)/../NMTTools - -libGEOMAlgo_la_LDFLAGS = \ - ../NMTTools/libNMTTools.la \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh -lTKOffset \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace - -# extra distributed files -CDL_FILES = GEOMAlgo.cdl - -EXTRA_DIST += \ - $(CDL_FILES) \ - FILES diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt new file mode 100755 index 000000000..5a701c2ab --- /dev/null +++ b/src/GEOMBase/CMakeLists.txt @@ -0,0 +1,97 @@ +# 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(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOM + DlgRef + ${KERNEL_SALOMELocalTrace} + ${GUI_SalomeApp} + ) + +# --- headers --- + +SET(GEOMBase_HEADERS + GEOMBase.h + GEOMBase_Skeleton.h + GEOMBase_Helper.h + GEOM_Operation.h + GEOM_GEOMBase.hxx + GEOM_GenericObjPtr.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + GEOMBase_Skeleton.h + ) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(GEOMBase_SOURCES + GEOMBase.cxx + GEOMBase_Skeleton.cxx + GEOMBase_Helper.cxx + GEOM_Operation.cxx + GEOM_GenericObjPtr.cxx + ${_moc_SOURCES} + ) + +# --- rules --- + +ADD_LIBRARY(GEOMBase ${GEOMBase_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMBase ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMBase EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMBase_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am deleted file mode 100644 index 087203851..000000000 --- a/src/GEOMBase/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 -# - -# GEOM GEOMBASE : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : GEOMBase -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOMBase.la - -# header files -salomeinclude_HEADERS = \ - GEOMBase.h \ - GEOMBase_Skeleton.h \ - GEOMBase_Helper.h \ - GEOM_Operation.h \ - GEOM_GEOMBase.hxx \ - GEOM_GenericObjPtr.h - -dist_libGEOMBase_la_SOURCES = \ - GEOMBase.cxx \ - GEOMBase_Skeleton.cxx \ - GEOMBase_Helper.cxx \ - GEOM_Operation.cxx \ - GEOM_GenericObjPtr.cxx - -MOC_FILES = \ - GEOMBase_Skeleton_moc.cxx - -nodist_libGEOMBase_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libGEOMBase_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(OPENCV_INCLUDES) \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libGEOMBase_la_LDFLAGS = \ - ../../idl/libSalomeIDLGEOM.la \ - ../GEOMGUI/libGEOM.la \ - ../DlgRef/libDlgRef.la \ - $(KERNEL_LDFLAGS) -lOpUtil \ - $(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \ - $(CAS_LDPATH) -lTKPrim \ - $(OPENCV_LIBS) diff --git a/src/GEOMClient/CMakeLists.txt b/src/GEOMClient/CMakeLists.txt new file mode 100755 index 000000000..5cdbf6b5b --- /dev/null +++ b/src/GEOMClient/CMakeLists.txt @@ -0,0 +1,61 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + SalomeIDLGEOM + ${CAS_TKBRep} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(GEOMClient_HEADERS + GEOM_Client.hxx + ) +# --- sources --- + +SET(GEOMClient_SOURCES + GEOM_Client.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMClient ${GEOMClient_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMClient ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMClient EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMClient_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/GEOMClient/Makefile.am b/src/GEOMClient/Makefile.am deleted file mode 100644 index c5c21a750..000000000 --- a/src/GEOMClient/Makefile.am +++ /dev/null @@ -1,57 +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 -# - -# GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - GEOM_Client.hxx - -# Libraries targets -lib_LTLIBRARIES = libGEOMClient.la - -# Sources files -dist_libGEOMClient_la_SOURCES = \ - GEOM_Client.cxx - -# additional information to compile and link file - -libGEOMClient_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl - -libGEOMClient_la_LDFLAGS = \ - ../../idl/libSalomeIDLGEOM.la \ - ../GEOM/libGEOMbasic.la \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSALOMEBasics -lOpUtil \ - $(CAS_TKTopAlgo) - -# \ -# $(CORBA_LIBS) \ -# #$(STDLIB) - diff --git a/src/GEOMFiltersSelection/CMakeLists.txt b/src/GEOMFiltersSelection/CMakeLists.txt new file mode 100755 index 000000000..8676e65e9 --- /dev/null +++ b/src/GEOMFiltersSelection/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 +# + +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + SalomeIDLGEOM + GEOMClient + ${CAS_TKBRep} + ${KERNEL_SALOMELocalTrace} + ${GUI_SalomeApp} + ) + +# --- headers --- + +SET(GEOMFiltersSelection_HEADERS + GEOM_SelectionFilter.h + GEOM_EdgeFilter.h + GEOM_FaceFilter.h + GEOM_TypeFilter.h + GEOM_PreviewFilter.h + GEOM_LogicalFilter.h + GEOM_OCCFilter.h + GEOM_CompoundFilter.h + ) +# --- sources --- + +SET(GEOMFiltersSelection_SOURCES + GEOM_SelectionFilter.cxx + GEOM_EdgeFilter.cxx + GEOM_FaceFilter.cxx + GEOM_TypeFilter.cxx + GEOM_PreviewFilter.cxx + GEOM_LogicalFilter.cxx + GEOM_OCCFilter.cxx + GEOM_CompoundFilter.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMFiltersSelection ${GEOMFiltersSelection_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMFiltersSelection ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMFiltersSelection EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMFiltersSelection_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/GEOMFiltersSelection/Makefile.am b/src/GEOMFiltersSelection/Makefile.am deleted file mode 100644 index 2d587d2af..000000000 --- a/src/GEOMFiltersSelection/Makefile.am +++ /dev/null @@ -1,71 +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 -# - -# GEOM GEOMFiltersSelection : filter selector for the viewer -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : GEOMFiltersSelection -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOMFiltersSelection.la - -# header files -salomeinclude_HEADERS = \ - GEOM_SelectionFilter.h \ - GEOM_EdgeFilter.h \ - GEOM_FaceFilter.h \ - GEOM_TypeFilter.h \ - GEOM_PreviewFilter.h \ - GEOM_LogicalFilter.h \ - GEOM_OCCFilter.h \ - GEOM_CompoundFilter.h - -# Sources -dist_libGEOMFiltersSelection_la_SOURCES = \ - GEOM_SelectionFilter.cxx \ - GEOM_EdgeFilter.cxx \ - GEOM_FaceFilter.cxx \ - GEOM_TypeFilter.cxx \ - GEOM_PreviewFilter.cxx \ - GEOM_LogicalFilter.cxx \ - GEOM_OCCFilter.cxx \ - GEOM_CompoundFilter.cxx - -# additional information to compile and link file - -libGEOMFiltersSelection_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(GUI_CXXFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMClient \ - -I$(top_builddir)/idl - -libGEOMFiltersSelection_la_LDFLAGS = \ - $(QT_MT_LIBS) \ - $(CAS_KERNEL) -lTKG3d -lTKV3d -lTKService \ - ../../idl/libSalomeIDLGEOM.la \ - ../GEOMClient/libGEOMClient.la \ - $(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession -lSalomeObject -lLightApp \ - $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt new file mode 100755 index 000000000..5a7cb587e --- /dev/null +++ b/src/GEOMGUI/CMakeLists.txt @@ -0,0 +1,119 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMFiltersSelection + ${PROJECT_SOURCE_DIR}/src/Material + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMFiltersSelection + Material + GEOMImpl + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeDS} + ${KERNEL_SalomeDSClient} + ${GUI_SalomeApp} + ${QT_QTXML_LIBRARY} + ) + +# --- headers --- + +SET(GEOMGUI_HEADERS + GeometryGUI.h + GeometryGUI_Operations.h + GEOMGUI.h + GEOMPluginGUI.h + GEOMGUI_XmlHandler.h + GEOM_Displayer.h + GEOMGUI_OCCSelector.h + GEOMGUI_Selection.h + GEOM_GEOMGUI.hxx + GEOMGUI_CreationInfoWdg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + GEOMGUI_CreationInfoWdg.h + GeometryGUI.h + ) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(GEOMGUI_SOURCES + GeometryGUI.cxx + GEOMGUI.cxx + GEOMPluginGUI.cxx + GEOMGUI_XmlHandler.cxx + GEOM_Displayer.cxx + GEOMGUI_OCCSelector.cxx + GEOMGUI_Selection.cxx + GEOMGUI_CreationInfoWdg.cxx + ${_moc_SOURCES} + ) + +# --- resources --- + +# resource files / to be processed by lrelease +SET(GEOMGUI_RESOURCES + GEOM_images.ts + GEOM_msg_en.ts + GEOM_msg_fr.ts + GEOM_msg_ja.ts +) + +# --- rules --- + +ADD_LIBRARY(GEOM ${GEOMGUI_SOURCES}) +TARGET_LINK_LIBRARIES(GEOM ${_link_LIBRARIES}) +INSTALL(TARGETS GEOM EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +QT4_INSTALL_TS_RESOURCES("${GEOMGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}") diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am deleted file mode 100644 index 0e30791d7..000000000 --- a/src/GEOMGUI/Makefile.am +++ /dev/null @@ -1,101 +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 -# - -# GEOM GEOMGUI : GUI for Geometry component -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : GEOMGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOM.la - -# header files -salomeinclude_HEADERS = \ - GeometryGUI.h \ - GeometryGUI_Operations.h\ - GEOMGUI.h \ - GEOMPluginGUI.h \ - GEOMGUI_XmlHandler.h \ - GEOM_Displayer.h \ - GEOMGUI_OCCSelector.h \ - GEOMGUI_Selection.h \ - GEOM_GEOMGUI.hxx \ - GEOMGUI_CreationInfoWdg.h - -dist_libGEOM_la_SOURCES = \ - GeometryGUI.cxx \ - GEOMGUI.cxx \ - GEOMPluginGUI.cxx \ - GEOMGUI_XmlHandler.cxx \ - GEOM_Displayer.cxx \ - GEOMGUI_OCCSelector.cxx \ - GEOMGUI_Selection.cxx \ - GEOMGUI_CreationInfoWdg.cxx - -MOC_FILES = \ - GEOMGUI_CreationInfoWdg_moc.cxx \ - GeometryGUI_moc.cxx - -nodist_libGEOM_la_SOURCES = \ - $(MOC_FILES) - -# resources files -nodist_salomeres_DATA = \ - GEOM_images.qm \ - GEOM_msg_en.qm \ - GEOM_msg_fr.qm \ - GEOM_msg_ja.qm - -# additional information to compile and link file - -libGEOM_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(OPENCV_INCLUDES) \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(srcdir)/../Material \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libGEOM_la_LDFLAGS = \ - $(PYTHON_LIBS) \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../Material/libMaterial.la \ - ../GEOMClient/libGEOMClient.la \ - ../OBJECT/libGEOMObject.la \ - $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDS -lSalomeDSClient \ - $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd \ - $(OPENCV_LIBS) - -# -lSalomeApp -# -lToolsGUI -# $(CORBA_LIBS) \ -# $(STDLIB) diff --git a/src/GEOMImpl/CMakeLists.txt b/src/GEOMImpl/CMakeLists.txt new file mode 100755 index 000000000..d9cc41b99 --- /dev/null +++ b/src/GEOMImpl/CMakeLists.txt @@ -0,0 +1,244 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/ShHealOper + ${PROJECT_SOURCE_DIR}/src/NMTDS + ${PROJECT_SOURCE_DIR}/src/NMTTools + ${PROJECT_SOURCE_DIR}/src/GEOM + ${PROJECT_SOURCE_DIR}/src/BlockFix + ${PROJECT_SOURCE_DIR}/src/GEOMAlgo + ${PROJECT_SOURCE_DIR}/src/GEOMUtils + ${PROJECT_SOURCE_DIR}/src/SKETCHER + ${PROJECT_SOURCE_DIR}/src/ARCHIMEDE + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${PYTHON_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKFeat} + ${PYTHON_LIBRARIES} + ShHealOper NMTTools GEOMbasic BlockFix GEOMAlgo GEOMUtils GEOMSketcher GEOMArchimede + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(GEOMImpl_HEADERS + GEOMImpl_Gen.hxx + GEOMImpl_IBasicOperations.hxx + GEOMImpl_ITransformOperations.hxx + GEOMImpl_IHealingOperations.hxx + GEOMImpl_I3DPrimOperations.hxx + GEOMImpl_IShapesOperations.hxx + GEOMImpl_IBlocksOperations.hxx + GEOMImpl_IBooleanOperations.hxx + GEOMImpl_ICurvesOperations.hxx + GEOMImpl_ILocalOperations.hxx + GEOMImpl_IInsertOperations.hxx + GEOMImpl_IMeasureOperations.hxx + GEOMImpl_IGroupOperations.hxx + GEOMImpl_IGlue.hxx + GEOMImpl_PointDriver.hxx + GEOMImpl_IPoint.hxx + GEOMImpl_IPolyline.hxx + GEOMImpl_ICircle.hxx + GEOMImpl_ISpline.hxx + GEOMImpl_IEllipse.hxx + GEOMImpl_IFillet.hxx + GEOMImpl_IFillet1d.hxx + GEOMImpl_IFillet2d.hxx + GEOMImpl_IChamfer.hxx + GEOMImpl_ICopy.hxx + GEOMImpl_IArchimede.hxx + GEOMImpl_IArc.hxx + GEOMImpl_ISketcher.hxx + GEOMImpl_I3DSketcher.hxx + GEOMImpl_IVector.hxx + GEOMImpl_IDisk.hxx + GEOMImpl_IFace.hxx + GEOMImpl_ILine.hxx + GEOMImpl_IPlane.hxx + GEOMImpl_IMarker.hxx + GEOMImpl_ITranslate.hxx + GEOMImpl_IMirror.hxx + GEOMImpl_IOffset.hxx + GEOMImpl_IScale.hxx + GEOMImpl_IRotate.hxx + GEOMImpl_IPosition.hxx + GEOMImpl_IHealing.hxx + GEOMImpl_IImportExport.hxx + GEOMImpl_IBox.hxx + GEOMImpl_IBlocks.hxx + GEOMImpl_IBlockTrsf.hxx + GEOMImpl_IBoolean.hxx + GEOMImpl_ICylinder.hxx + GEOMImpl_ICone.hxx + GEOMImpl_ISphere.hxx + GEOMImpl_ITorus.hxx + GEOMImpl_IPrism.hxx + GEOMImpl_IPipe.hxx + GEOMImpl_IPipePath.hxx + GEOMImpl_IRevolution.hxx + GEOMImpl_IMeasure.hxx + GEOMImpl_IShapes.hxx + GEOMImpl_IFilling.hxx + GEOMImpl_IThruSections.hxx + GEOMImpl_IPartition.hxx + GEOMImpl_IPipeDiffSect.hxx + GEOMImpl_IPipeShellSect.hxx + GEOMImpl_IPipeBiNormal.hxx + GEOMImpl_ICurveParametric.hxx + GEOMImpl_VectorDriver.hxx + GEOMImpl_LineDriver.hxx + GEOMImpl_DiskDriver.hxx + GEOMImpl_FaceDriver.hxx + GEOMImpl_PlaneDriver.hxx + GEOMImpl_MarkerDriver.hxx + GEOMImpl_TranslateDriver.hxx + GEOMImpl_MirrorDriver.hxx + GEOMImpl_ProjectionDriver.hxx + GEOMImpl_OffsetDriver.hxx + GEOMImpl_ScaleDriver.hxx + GEOMImpl_PositionDriver.hxx + GEOMImpl_BoxDriver.hxx + GEOMImpl_ConeDriver.hxx + GEOMImpl_CylinderDriver.hxx + GEOMImpl_SphereDriver.hxx + GEOMImpl_TorusDriver.hxx + GEOMImpl_PrismDriver.hxx + GEOMImpl_PipeDriver.hxx + GEOMImpl_PipePathDriver.hxx + GEOMImpl_ThruSectionsDriver.hxx + GEOMImpl_RevolutionDriver.hxx + GEOMImpl_ShapeDriver.hxx + GEOMImpl_BlockDriver.hxx + GEOMImpl_Block6Explorer.hxx + GEOMImpl_MeasureDriver.hxx + GEOMImpl_PolylineDriver.hxx + GEOMImpl_CircleDriver.hxx + GEOMImpl_EllipseDriver.hxx + GEOMImpl_ArcDriver.hxx + GEOMImpl_SplineDriver.hxx + GEOMImpl_SketcherDriver.hxx + GEOMImpl_3DSketcherDriver.hxx + GEOMImpl_FilletDriver.hxx + GEOMImpl_Fillet1d.hxx + GEOMImpl_Fillet1dDriver.hxx + GEOMImpl_Fillet2dDriver.hxx + GEOMImpl_ChamferDriver.hxx + GEOMImpl_BooleanDriver.hxx + GEOMImpl_PartitionDriver.hxx + GEOMImpl_CopyDriver.hxx + GEOMImpl_ExportDriver.hxx + GEOMImpl_ImportDriver.hxx + GEOMImpl_RotateDriver.hxx + GEOMImpl_ArchimedeDriver.hxx + GEOMImpl_HealingDriver.hxx + GEOMImpl_FillingDriver.hxx + GEOMImpl_GlueDriver.hxx + GEOMImpl_Types.hxx + GEOM_GEOMImpl.hxx + ) +# --- sources --- + +SET(GEOMImpl_SOURCES + GEOMImpl_IBasicOperations.cxx + GEOMImpl_ITransformOperations.cxx + GEOMImpl_IHealingOperations.cxx + GEOMImpl_I3DPrimOperations.cxx + GEOMImpl_IShapesOperations.cxx + GEOMImpl_IBlocksOperations.cxx + GEOMImpl_IBooleanOperations.cxx + GEOMImpl_ICurvesOperations.cxx + GEOMImpl_ILocalOperations.cxx + GEOMImpl_IInsertOperations.cxx + GEOMImpl_IMeasureOperations.cxx + GEOMImpl_IGroupOperations.cxx + GEOMImpl_Gen.cxx + GEOMImpl_PointDriver.cxx + GEOMImpl_VectorDriver.cxx + GEOMImpl_LineDriver.cxx + GEOMImpl_PlaneDriver.cxx + GEOMImpl_MarkerDriver.cxx + GEOMImpl_TranslateDriver.cxx + GEOMImpl_MirrorDriver.cxx + GEOMImpl_ProjectionDriver.cxx + GEOMImpl_OffsetDriver.cxx + GEOMImpl_ScaleDriver.cxx + GEOMImpl_PositionDriver.cxx + GEOMImpl_BoxDriver.cxx + GEOMImpl_FaceDriver.cxx + GEOMImpl_DiskDriver.cxx + GEOMImpl_ConeDriver.cxx + GEOMImpl_CylinderDriver.cxx + GEOMImpl_SphereDriver.cxx + GEOMImpl_TorusDriver.cxx + GEOMImpl_PrismDriver.cxx + GEOMImpl_PipeDriver.cxx + GEOMImpl_PipePathDriver.cxx + GEOMImpl_ThruSectionsDriver.cxx + GEOMImpl_RevolutionDriver.cxx + GEOMImpl_ShapeDriver.cxx + GEOMImpl_BlockDriver.cxx + GEOMImpl_Block6Explorer.cxx + GEOMImpl_MeasureDriver.cxx + GEOMImpl_PolylineDriver.cxx + GEOMImpl_CircleDriver.cxx + GEOMImpl_EllipseDriver.cxx + GEOMImpl_ArcDriver.cxx + GEOMImpl_SplineDriver.cxx + GEOMImpl_SketcherDriver.cxx + GEOMImpl_3DSketcherDriver.cxx + GEOMImpl_FilletDriver.cxx + GEOMImpl_Fillet1d.cxx + GEOMImpl_Fillet1dDriver.cxx + GEOMImpl_Fillet2dDriver.cxx + GEOMImpl_ChamferDriver.cxx + GEOMImpl_BooleanDriver.cxx + GEOMImpl_PartitionDriver.cxx + GEOMImpl_CopyDriver.cxx + GEOMImpl_ExportDriver.cxx + GEOMImpl_ImportDriver.cxx + GEOMImpl_RotateDriver.cxx + GEOMImpl_ArchimedeDriver.cxx + GEOMImpl_HealingDriver.cxx + GEOMImpl_FillingDriver.cxx + GEOMImpl_GlueDriver.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMImpl ${GEOMImpl_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMImpl ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMImpl EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMImpl_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am deleted file mode 100644 index a20ee6e2e..000000000 --- a/src/GEOMImpl/Makefile.am +++ /dev/null @@ -1,246 +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 -# - -# GEOM GEOM : implementaion of GEOM_Gen.idl -# File : Makefile.in -# Author : Damien COQUERET (OCC) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOMimpl.la - -# header files -salomeinclude_HEADERS = \ - GEOMImpl_Gen.hxx \ - GEOMImpl_IBasicOperations.hxx \ - GEOMImpl_ITransformOperations.hxx \ - GEOMImpl_IHealingOperations.hxx \ - GEOMImpl_I3DPrimOperations.hxx \ - GEOMImpl_IShapesOperations.hxx \ - GEOMImpl_IBlocksOperations.hxx \ - GEOMImpl_IBooleanOperations.hxx \ - GEOMImpl_ICurvesOperations.hxx \ - GEOMImpl_ILocalOperations.hxx \ - GEOMImpl_IInsertOperations.hxx \ - GEOMImpl_IMeasureOperations.hxx \ - GEOMImpl_IGroupOperations.hxx \ - GEOMImpl_IGlue.hxx \ - GEOMImpl_PointDriver.hxx \ - GEOMImpl_IPoint.hxx \ - GEOMImpl_IPolyline.hxx \ - GEOMImpl_ICircle.hxx \ - GEOMImpl_ISpline.hxx \ - GEOMImpl_IEllipse.hxx \ - GEOMImpl_IFillet.hxx \ - GEOMImpl_IFillet1d.hxx \ - GEOMImpl_IFillet2d.hxx \ - GEOMImpl_IChamfer.hxx \ - GEOMImpl_ICopy.hxx \ - GEOMImpl_IArchimede.hxx \ - GEOMImpl_IArc.hxx \ - GEOMImpl_ISketcher.hxx \ - GEOMImpl_I3DSketcher.hxx \ - GEOMImpl_IVector.hxx \ - GEOMImpl_IDisk.hxx \ - GEOMImpl_IFace.hxx \ - GEOMImpl_ILine.hxx \ - GEOMImpl_IPlane.hxx \ - GEOMImpl_IMarker.hxx \ - GEOMImpl_ITranslate.hxx \ - GEOMImpl_IMirror.hxx \ - GEOMImpl_IOffset.hxx \ - GEOMImpl_IScale.hxx \ - GEOMImpl_IRotate.hxx \ - GEOMImpl_IPosition.hxx \ - GEOMImpl_IHealing.hxx \ - GEOMImpl_IImportExport.hxx \ - GEOMImpl_IBox.hxx \ - GEOMImpl_IBlocks.hxx \ - GEOMImpl_IBlockTrsf.hxx \ - GEOMImpl_IBoolean.hxx \ - GEOMImpl_ICylinder.hxx \ - GEOMImpl_ICone.hxx \ - GEOMImpl_ISphere.hxx \ - GEOMImpl_ITorus.hxx \ - GEOMImpl_IPrism.hxx \ - GEOMImpl_IPipe.hxx \ - GEOMImpl_IPipePath.hxx \ - GEOMImpl_IRevolution.hxx \ - GEOMImpl_IMeasure.hxx \ - GEOMImpl_IShapes.hxx \ - GEOMImpl_IFilling.hxx \ - GEOMImpl_IThruSections.hxx \ - GEOMImpl_IPartition.hxx \ - GEOMImpl_IPipeDiffSect.hxx \ - GEOMImpl_IPipeShellSect.hxx \ - GEOMImpl_IPipeBiNormal.hxx \ - GEOMImpl_ICurveParametric.hxx \ - GEOMImpl_VectorDriver.hxx \ - GEOMImpl_LineDriver.hxx \ - GEOMImpl_DiskDriver.hxx \ - GEOMImpl_FaceDriver.hxx \ - GEOMImpl_PlaneDriver.hxx \ - GEOMImpl_MarkerDriver.hxx \ - GEOMImpl_TranslateDriver.hxx \ - GEOMImpl_MirrorDriver.hxx \ - GEOMImpl_ProjectionDriver.hxx \ - GEOMImpl_OffsetDriver.hxx \ - GEOMImpl_ScaleDriver.hxx \ - GEOMImpl_PositionDriver.hxx \ - GEOMImpl_BoxDriver.hxx \ - GEOMImpl_ConeDriver.hxx \ - GEOMImpl_CylinderDriver.hxx \ - GEOMImpl_SphereDriver.hxx \ - GEOMImpl_TorusDriver.hxx \ - GEOMImpl_PrismDriver.hxx \ - GEOMImpl_PipeDriver.hxx \ - GEOMImpl_PipePathDriver.hxx \ - GEOMImpl_ThruSectionsDriver.hxx \ - GEOMImpl_RevolutionDriver.hxx \ - GEOMImpl_ShapeDriver.hxx \ - GEOMImpl_BlockDriver.hxx \ - GEOMImpl_Block6Explorer.hxx \ - GEOMImpl_MeasureDriver.hxx \ - GEOMImpl_PolylineDriver.hxx \ - GEOMImpl_CircleDriver.hxx \ - GEOMImpl_EllipseDriver.hxx \ - GEOMImpl_ArcDriver.hxx \ - GEOMImpl_SplineDriver.hxx \ - GEOMImpl_SketcherDriver.hxx \ - GEOMImpl_3DSketcherDriver.hxx \ - GEOMImpl_FilletDriver.hxx \ - GEOMImpl_Fillet1d.hxx \ - GEOMImpl_Fillet1dDriver.hxx \ - GEOMImpl_Fillet2dDriver.hxx \ - GEOMImpl_ChamferDriver.hxx \ - GEOMImpl_BooleanDriver.hxx \ - GEOMImpl_PartitionDriver.hxx \ - GEOMImpl_CopyDriver.hxx \ - GEOMImpl_ExportDriver.hxx \ - GEOMImpl_ImportDriver.hxx \ - GEOMImpl_RotateDriver.hxx \ - GEOMImpl_ArchimedeDriver.hxx \ - GEOMImpl_HealingDriver.hxx \ - GEOMImpl_FillingDriver.hxx \ - GEOMImpl_GlueDriver.hxx \ - GEOMImpl_Types.hxx \ - GEOM_GEOMImpl.hxx - -dist_libGEOMimpl_la_SOURCES = \ - GEOMImpl_IBasicOperations.cxx \ - GEOMImpl_ITransformOperations.cxx \ - GEOMImpl_IHealingOperations.cxx \ - GEOMImpl_I3DPrimOperations.cxx \ - GEOMImpl_IShapesOperations.cxx \ - GEOMImpl_IBlocksOperations.cxx \ - GEOMImpl_IBooleanOperations.cxx \ - GEOMImpl_ICurvesOperations.cxx \ - GEOMImpl_ILocalOperations.cxx \ - GEOMImpl_IInsertOperations.cxx \ - GEOMImpl_IMeasureOperations.cxx \ - GEOMImpl_IGroupOperations.cxx \ - GEOMImpl_Gen.cxx \ - GEOMImpl_PointDriver.cxx \ - GEOMImpl_VectorDriver.cxx \ - GEOMImpl_LineDriver.cxx \ - GEOMImpl_PlaneDriver.cxx \ - GEOMImpl_MarkerDriver.cxx \ - GEOMImpl_TranslateDriver.cxx \ - GEOMImpl_MirrorDriver.cxx \ - GEOMImpl_ProjectionDriver.cxx \ - GEOMImpl_OffsetDriver.cxx \ - GEOMImpl_ScaleDriver.cxx \ - GEOMImpl_PositionDriver.cxx \ - GEOMImpl_BoxDriver.cxx \ - GEOMImpl_FaceDriver.cxx \ - GEOMImpl_DiskDriver.cxx \ - GEOMImpl_ConeDriver.cxx \ - GEOMImpl_CylinderDriver.cxx \ - GEOMImpl_SphereDriver.cxx \ - GEOMImpl_TorusDriver.cxx \ - GEOMImpl_PrismDriver.cxx \ - GEOMImpl_PipeDriver.cxx \ - GEOMImpl_PipePathDriver.cxx \ - GEOMImpl_ThruSectionsDriver.cxx \ - GEOMImpl_RevolutionDriver.cxx \ - GEOMImpl_ShapeDriver.cxx \ - GEOMImpl_BlockDriver.cxx \ - GEOMImpl_Block6Explorer.cxx \ - GEOMImpl_MeasureDriver.cxx \ - GEOMImpl_PolylineDriver.cxx \ - GEOMImpl_CircleDriver.cxx \ - GEOMImpl_EllipseDriver.cxx \ - GEOMImpl_ArcDriver.cxx \ - GEOMImpl_SplineDriver.cxx \ - GEOMImpl_SketcherDriver.cxx \ - GEOMImpl_3DSketcherDriver.cxx \ - GEOMImpl_FilletDriver.cxx \ - GEOMImpl_Fillet1d.cxx \ - GEOMImpl_Fillet1dDriver.cxx \ - GEOMImpl_Fillet2dDriver.cxx \ - GEOMImpl_ChamferDriver.cxx \ - GEOMImpl_BooleanDriver.cxx \ - GEOMImpl_PartitionDriver.cxx \ - GEOMImpl_CopyDriver.cxx \ - GEOMImpl_ExportDriver.cxx \ - GEOMImpl_ImportDriver.cxx \ - GEOMImpl_RotateDriver.cxx \ - GEOMImpl_ArchimedeDriver.cxx \ - GEOMImpl_HealingDriver.cxx \ - GEOMImpl_FillingDriver.cxx \ - GEOMImpl_GlueDriver.cxx - -# additional information to compile and link file - -libGEOMimpl_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - -I$(srcdir)/../ShHealOper \ - -I$(srcdir)/../NMTDS \ - -I$(srcdir)/../NMTTools \ - -I$(srcdir)/../GEOM \ - -I$(srcdir)/../BlockFix \ - -I$(srcdir)/../GEOMAlgo \ - -I$(srcdir)/../GEOMUtils \ - -I$(srcdir)/../SKETCHER \ - -I$(srcdir)/../ARCHIMEDE \ - -I$(top_builddir)/idl - -libGEOMimpl_la_LDFLAGS = \ - ../GEOM/libGEOMbasic.la \ - ../BlockFix/libBlockFix.la \ - ../GEOMAlgo/libGEOMAlgo.la \ - ../GEOMUtils/libGEOMUtils.la \ - ../ShHealOper/libShHealOper.la \ - ../ARCHIMEDE/libGEOMArchimede.la \ - ../SKETCHER/libGEOMSketcher.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lTKFeat \ - $(PYTHON_LIBS) - -# extra dist files -EXTRA_DIST += GUID.txt diff --git a/src/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt new file mode 100755 index 000000000..7b718482a --- /dev/null +++ b/src/GEOMToolsGUI/CMakeLists.txt @@ -0,0 +1,110 @@ +# 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(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/Material + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOM + GEOMBase + Material + ) + +# --- headers --- + +SET(GEOMToolsGUI_HEADERS + GEOMToolsGUI.h + GEOM_ToolsGUI.hxx + GEOMToolsGUI_NbIsosDlg.h + GEOMToolsGUI_DeflectionDlg.h + GEOMToolsGUI_TransparencyDlg.h + GEOMToolsGUI_DeleteDlg.h + GEOMToolsGUI_MarkerDlg.h + GEOMToolsGUI_PublishDlg.h + GEOMToolsGUI_MaterialPropertiesDlg.h + GEOMToolsGUI_LineWidthDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + GEOMToolsGUI_TransparencyDlg.h + GEOMToolsGUI_NbIsosDlg.h + GEOMToolsGUI_DeflectionDlg.h + GEOMToolsGUI_DeleteDlg.h + GEOMToolsGUI_MarkerDlg.h + GEOMToolsGUI_PublishDlg.h + GEOMToolsGUI_MaterialPropertiesDlg.h + GEOMToolsGUI_LineWidthDlg.h + ) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(GEOMToolsGUI_SOURCES + GEOMToolsGUI.cxx + GEOMToolsGUI_1.cxx + GEOMToolsGUI_TransparencyDlg.cxx + GEOMToolsGUI_NbIsosDlg.cxx + GEOMToolsGUI_DeflectionDlg.cxx + GEOMToolsGUI_DeleteDlg.cxx + GEOMToolsGUI_MarkerDlg.cxx + GEOMToolsGUI_PublishDlg.cxx + GEOMToolsGUI_MaterialPropertiesDlg.cxx + GEOMToolsGUI_LineWidthDlg.cxx + ${_moc_SOURCES} + ) + +# --- rules --- + +ADD_LIBRARY(GEOMToolsGUI ${GEOMToolsGUI_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMToolsGUI ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMToolsGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am deleted file mode 100644 index 437e43deb..000000000 --- a/src/GEOMToolsGUI/Makefile.am +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : GEOMToolsGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOMToolsGUI.la - -# header files -salomeinclude_HEADERS = \ - GEOMToolsGUI.h \ - GEOM_ToolsGUI.hxx \ - GEOMToolsGUI_NbIsosDlg.h \ - GEOMToolsGUI_DeflectionDlg.h \ - GEOMToolsGUI_TransparencyDlg.h \ - GEOMToolsGUI_DeleteDlg.h \ - GEOMToolsGUI_MarkerDlg.h \ - GEOMToolsGUI_PublishDlg.h \ - GEOMToolsGUI_MaterialPropertiesDlg.h \ - GEOMToolsGUI_LineWidthDlg.h - -dist_libGEOMToolsGUI_la_SOURCES = \ - GEOMToolsGUI.cxx \ - GEOMToolsGUI_1.cxx \ - GEOMToolsGUI_TransparencyDlg.cxx \ - GEOMToolsGUI_NbIsosDlg.cxx \ - GEOMToolsGUI_DeflectionDlg.cxx \ - GEOMToolsGUI_DeleteDlg.cxx \ - GEOMToolsGUI_MarkerDlg.cxx \ - GEOMToolsGUI_PublishDlg.cxx \ - GEOMToolsGUI_MaterialPropertiesDlg.cxx \ - GEOMToolsGUI_LineWidthDlg.cxx - -MOC_FILES = \ - GEOMToolsGUI_TransparencyDlg_moc.cxx \ - GEOMToolsGUI_NbIsosDlg_moc.cxx \ - GEOMToolsGUI_DeflectionDlg_moc.cxx \ - GEOMToolsGUI_DeleteDlg_moc.cxx \ - GEOMToolsGUI_MarkerDlg_moc.cxx \ - GEOMToolsGUI_PublishDlg_moc.cxx \ - GEOMToolsGUI_MaterialPropertiesDlg_moc.cxx \ - GEOMToolsGUI_LineWidthDlg_moc.cxx - -nodist_libGEOMToolsGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libGEOMToolsGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../Material \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(top_builddir)/idl - -libGEOMToolsGUI_la_LDFLAGS = \ - ../GEOMBase/libGEOMBase.la \ - ../Material/libMaterial.la \ - ../GEOMGUI/libGEOM.la \ - $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp -lPyConsole diff --git a/src/GEOMUtils/CMakeLists.txt b/src/GEOMUtils/CMakeLists.txt new file mode 100755 index 000000000..6ca2c5e35 --- /dev/null +++ b/src/GEOMUtils/CMakeLists.txt @@ -0,0 +1,57 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKBRep} ${CAS_TKShHealing} ${CAS_TKMesh} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(GEOMUtils_HEADERS + GEOMUtils.hxx + ) +# --- sources --- + +SET(GEOMUtils_SOURCES + GEOMUtils.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMUtils ${GEOMUtils_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMUtils ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMUtils EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMUtils_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/GEOMUtils/Makefile.am b/src/GEOMUtils/Makefile.am deleted file mode 100644 index 73c1ebda4..000000000 --- a/src/GEOMUtils/Makefile.am +++ /dev/null @@ -1,58 +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 -# - -# GEOMUtils : implementaion of some common methods for GEOMImpl package -# File : Makefile.am -# Author : Julia DOROVSKIKH - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOMUtils.la - -# header files -salomeinclude_HEADERS = \ - GEOMUtils.hxx - -dist_libGEOMUtils_la_SOURCES = \ - GEOMUtils.cxx - -# additional information to compile and link file - -libGEOMUtils_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../ShHealOper \ - -I$(srcdir)/../NMTDS \ - -I$(srcdir)/../NMTTools \ - -I$(srcdir)/../BlockFix \ - -I$(srcdir)/../GEOMAlgo \ - -I$(srcdir)/../SKETCHER \ - -I$(srcdir)/../ARCHIMEDE - -libGEOMUtils_la_LDFLAGS = \ - ../BlockFix/libBlockFix.la \ - ../GEOMAlgo/libGEOMAlgo.la \ - ../ShHealOper/libShHealOper.la \ - ../ARCHIMEDE/libGEOMArchimede.la \ - ../SKETCHER/libGEOMSketcher.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \ - $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lTKFeat \ - $(STDLIB) diff --git a/src/GEOM_I/CMakeLists.txt b/src/GEOM_I/CMakeLists.txt new file mode 100755 index 000000000..b76838402 --- /dev/null +++ b/src/GEOM_I/CMakeLists.txt @@ -0,0 +1,100 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOM + ${PROJECT_SOURCE_DIR}/src/GEOMAlgo + ${PROJECT_BINARY_DIR}/idl + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMImpl + SalomeIDLGEOM + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeGenericObj} + ${KERNEL_TOOLSDS} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ) + +# --- headers --- + +SET(GEOMEngine_HEADERS + # GEOM_Object_i.hh + # GEOM_IOperations_i.hh + # GEOM_IBasicOperations_i.hh + # GEOM_IHealingOperations_i.hh + # GEOM_I3DPrimOperations_i.hh + # GEOM_IShapesOperations_i.hh + # GEOM_IBlocksOperations_i.hh + # GEOM_IBooleanOperations_i.hh + # GEOM_ICurvesOperations_i.hh + # GEOM_ILocalOperations_i.hh + # GEOM_IInsertOperations_i.hh + # GEOM_ITransformOperations_i.hh + # GEOM_IMeasureOperations_i.hh + # GEOM_IGroupOperations_i.hh + # GEOM_Gen_i.hh + # GEOM_GEOM_I.hxx + GEOM_wrap.hxx + ) +# --- sources --- + +SET(GEOMEngine_SOURCES + GEOM_Object_i.cc + GEOM_IOperations_i.cc + GEOM_IBasicOperations_i.cc + GEOM_IHealingOperations_i.cc + GEOM_I3DPrimOperations_i.cc + GEOM_IShapesOperations_i.cc + GEOM_IBlocksOperations_i.cc + GEOM_IBooleanOperations_i.cc + GEOM_ICurvesOperations_i.cc + GEOM_ILocalOperations_i.cc + GEOM_IInsertOperations_i.cc + GEOM_ITransformOperations_i.cc + GEOM_IMeasureOperations_i.cc + GEOM_IGroupOperations_i.cc + GEOM_Gen_i.cc + GEOM_DumpPython.cc + ) + +# --- rules --- + +ADD_LIBRARY(GEOMEngine ${GEOMEngine_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMEngine ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GEOMEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) \ No newline at end of file diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am deleted file mode 100644 index 4dee78ed9..000000000 --- a/src/GEOM_I/Makefile.am +++ /dev/null @@ -1,98 +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 -# - -# GEOM GEOM : implementaion of GEOM_Gen.idl -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGEOMEngine.la - -# header files -salomeinclude_HEADERS = \ - GEOM_Object_i.hh \ - GEOM_IOperations_i.hh \ - GEOM_IBasicOperations_i.hh \ - GEOM_IHealingOperations_i.hh \ - GEOM_I3DPrimOperations_i.hh \ - GEOM_IShapesOperations_i.hh \ - GEOM_IBlocksOperations_i.hh \ - GEOM_IBooleanOperations_i.hh \ - GEOM_ICurvesOperations_i.hh \ - GEOM_ILocalOperations_i.hh \ - GEOM_IInsertOperations_i.hh \ - GEOM_ITransformOperations_i.hh \ - GEOM_IMeasureOperations_i.hh \ - GEOM_IGroupOperations_i.hh \ - GEOM_Gen_i.hh \ - GEOM_GEOM_I.hxx \ - GEOM_wrap.hxx - -dist_libGEOMEngine_la_SOURCES = \ - GEOM_Object_i.cc \ - GEOM_IOperations_i.cc \ - GEOM_IBasicOperations_i.cc \ - GEOM_IHealingOperations_i.cc \ - GEOM_I3DPrimOperations_i.cc \ - GEOM_IShapesOperations_i.cc \ - GEOM_IBlocksOperations_i.cc \ - GEOM_IBooleanOperations_i.cc \ - GEOM_ICurvesOperations_i.cc \ - GEOM_ILocalOperations_i.cc \ - GEOM_IInsertOperations_i.cc \ - GEOM_ITransformOperations_i.cc \ - GEOM_IMeasureOperations_i.cc \ - GEOM_IGroupOperations_i.cc \ - GEOM_Gen_i.cc \ - GEOM_DumpPython.cc - -# additional information to compile and link file - -libGEOMEngine_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../SKETCHER \ - -I$(srcdir)/../ARCHIMEDE \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMAlgo \ - -I$(srcdir)/../GEOM \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - - -libGEOMEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLGEOM.la \ - ../ARCHIMEDE/libGEOMArchimede.la \ - ../GEOMImpl/libGEOMimpl.la \ - ../SKETCHER/libGEOMSketcher.la \ - ../GEOM/libGEOMbasic.la \ - $(KERNEL_LDFLAGS) -lOpUtil -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ - $(CAS_DATAEXCHANGE) \ - $(CAS_LDPATH) -lTKFillet -lTKOffset - -# \ -# $(STDLIB) \ -# $(CORBA_LIBS) diff --git a/src/GEOM_I_Superv/CMakeLists.txt b/src/GEOM_I_Superv/CMakeLists.txt new file mode 100755 index 000000000..94f1ef3e6 --- /dev/null +++ b/src/GEOM_I_Superv/CMakeLists.txt @@ -0,0 +1,64 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + SalomeIDLGEOM + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeDSClient} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ) + +# --- headers --- + +SET(GEOM_SupervEngine_HEADERS + GEOM_Superv_i.hh + GEOM_List_i.hh + GEOM_I_Superv.hxx + ) +# --- sources --- + +SET(GEOM_SupervEngine_SOURCES + GEOM_Superv_i.cc + ) + +# --- rules --- + +ADD_LIBRARY(GEOM_SupervEngine ${GEOM_SupervEngine_SOURCES}) +TARGET_LINK_LIBRARIES(GEOM_SupervEngine ${_link_LIBRARIES}) +INSTALL(TARGETS GEOM_SupervEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + diff --git a/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am deleted file mode 100644 index 812e2dd43..000000000 --- a/src/GEOM_I_Superv/Makefile.am +++ /dev/null @@ -1,64 +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 -# - -# GEOM GEOM : implementaion of GEOM_Superv.idl -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM - -# Libraries targets -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - GEOM_Superv_i.hh \ - GEOM_List_i.hh \ - GEOM_I_Superv.hxx - -# Libraries targets -lib_LTLIBRARIES = libGEOM_SupervEngine.la - -dist_libGEOM_SupervEngine_la_SOURCES = \ - GEOM_Superv_i.cc - -# additional information to compile and link file - -libGEOM_SupervEngine_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(QT_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOM \ - -I$(srcdir)/../GEOM_I \ - -I$(srcdir)/../GEOMAlgo \ - -I$(top_builddir)/idl - -libGEOM_SupervEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLGEOM.la \ - $(CORBA_LIBS) \ - $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient -lSALOMELocalTrace \ - $(STDLIB) diff --git a/src/GEOM_PY/CMakeLists.txt b/src/GEOM_PY/CMakeLists.txt new file mode 100755 index 000000000..218141ce1 --- /dev/null +++ b/src/GEOM_PY/CMakeLists.txt @@ -0,0 +1,32 @@ +# 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( structelem ) + +# scripts / python + +SET(_python_SCRIPTS + __init__.py + geomtools.py + sketcher.py + ) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom) diff --git a/src/GEOM_PY/Makefile.am b/src/GEOM_PY/structelem/CMakeLists.txt old mode 100644 new mode 100755 similarity index 75% rename from src/GEOM_PY/Makefile.am rename to src/GEOM_PY/structelem/CMakeLists.txt index 40993daea..4a2819be1 --- a/src/GEOM_PY/Makefile.am +++ b/src/GEOM_PY/structelem/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,12 +17,14 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# scripts / python -SUBDIRS= structelem +SET(_python_SCRIPTS + __init__.py + parts.py + orientation.py + ) -mypkgpythondir = $(salomepythondir)/salome/geom -mypkgpython_PYTHON = \ - __init__.py \ - geomtools.py \ - sketcher.py +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/structelem) diff --git a/src/GEOM_PY/structelem/Makefile.am b/src/GEOM_PY/structelem/Makefile.am deleted file mode 100644 index 6008b17ea..000000000 --- a/src/GEOM_PY/structelem/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -salomepypkgdir = $(salomepythondir)/salome/geom/structelem -salomepypkg_PYTHON = \ - __init__.py \ - parts.py \ - orientation.py diff --git a/src/GEOM_SWIG/CMakeLists.txt b/src/GEOM_SWIG/CMakeLists.txt new file mode 100755 index 000000000..bdbbc01d5 --- /dev/null +++ b/src/GEOM_SWIG/CMakeLists.txt @@ -0,0 +1,76 @@ +# 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 / samples,data +SET(_other_SCRIPTS + geompy.py + GEOM_Spanner.py + GEOM_blocks.py + GEOM_example.py + GEOM_example2.py + GEOM_example3.py + GEOM_example4.py + GEOM_example5.py + GEOM_example6.py + GEOM_example7.py + GEOM_moteur.py + GEOM_TestAll.py + GEOM_TestOthers.py + GEOM_TestHealing.py + GEOM_TestMeasures.py + GEOM_usinggeom.py + GEOM_Partition1.py + GEOM_Partition2.py + GEOM_Partition3.py + GEOM_Partition4.py + GEOM_Partition5.py + GEOM_cyl2complementary.py + GEOM_shellSolid.py + GEOM_tube_geom.py + GEOM_tube_geom_gg2.py + GEOM_Nut.py + GEOM_Sketcher.py + GEOM_ObjectInfo.py + PAL_MESH_019_020_geometry.py + PAL_MESH_028_geometry.py + PAL_MESH_030_geometry.py + PAL_MESH_033_geometry.py + PAL_MESH_035_geometry.py + ) + +# scripts / python + +SET(_python_SCRIPTS + geomBuilder.py + gsketcher.py + ) + +# scripts / shared + +SET(_shared_SCRIPTS + GEOM_shared_modules.py + ) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${_other_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_DATA}) +SALOME_INSTALL_SCRIPTS("${_shared_SCRIPTS}" ${SALOME_INSTALL_PYTHON_SHARED}) +SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom) diff --git a/src/GEOM_SWIG/Makefile.am b/src/GEOM_SWIG/Makefile.am deleted file mode 100644 index 0cea1d426..000000000 --- a/src/GEOM_SWIG/Makefile.am +++ /dev/null @@ -1,76 +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 -# - -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python -# File : Makefile.in -# Author : Nicolas REJNERI, Paul RASCLE -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# Libraries targets -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# =============================================================== -# Files to be installed -# =============================================================== -# - -# Scripts to be installed. -dist_salomescript_DATA = \ - geompy.py \ - GEOM_Spanner.py \ - GEOM_blocks.py \ - GEOM_example.py \ - GEOM_example2.py \ - GEOM_example3.py \ - GEOM_example4.py \ - GEOM_example5.py \ - GEOM_example6.py \ - GEOM_example7.py \ - GEOM_moteur.py \ - GEOM_TestAll.py \ - GEOM_TestOthers.py \ - GEOM_TestHealing.py \ - GEOM_TestMeasures.py \ - GEOM_usinggeom.py \ - GEOM_Partition1.py \ - GEOM_Partition2.py \ - GEOM_Partition3.py \ - GEOM_Partition4.py \ - GEOM_Partition5.py \ - GEOM_cyl2complementary.py \ - GEOM_shellSolid.py \ - GEOM_tube_geom.py \ - GEOM_tube_geom_gg2.py \ - GEOM_Nut.py \ - GEOM_Sketcher.py \ - GEOM_ObjectInfo.py \ - PAL_MESH_019_020_geometry.py \ - PAL_MESH_028_geometry.py \ - PAL_MESH_030_geometry.py \ - PAL_MESH_033_geometry.py \ - PAL_MESH_035_geometry.py - -mypkgpythondir = $(salomepythondir)/salome/geom -mypkgpython_PYTHON = \ - geomBuilder.py \ - gsketcher.py - -sharedpkgpython_PYTHON = \ - GEOM_shared_modules.py diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt new file mode 100755 index 000000000..87276c9b1 --- /dev/null +++ b/src/GEOM_SWIG_WITHIHM/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 +# + +INCLUDE(${SWIG_USE_FILE}) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/Material + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +# swig flags +SET_SOURCE_FILES_PROPERTIES(libGEOM_Swig.i PROPERTIES CPLUSPLUS ON) +SET_SOURCE_FILES_PROPERTIES(libGEOM_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libGEOM_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + Material + ${PYTHON_LIBRARIES} + ) + +# --- headers --- + +# header files / to install +SET(libGEOM_Swig_HEADERS +) + +# --- scripts --- + +# scripts / swig wrappings +SET(_swig_SCRIPTS + ${CMAKE_CURRENT_BINARY_DIR}/libGEOM_Swig.py +) + +# --- rules --- + +SWIG_ADD_MODULE(libGEOM_Swig python libGEOM_Swig.i libGEOM_Swig.cxx) +SWIG_LINK_LIBRARIES(libGEOM_Swig "${_link_LIBRARIES}") +IF(WINDOWS) + SET_TARGET_PROPERTIES(_libGEOM_Swig PROPERTIES DEBUG_OUTPUT_NAME _libGEOM_Swig_d) +ENDIF(WINDOWS) + +INSTALL(TARGETS _libGEOM_Swig DESTINATION ${SALOME_INSTALL_PYTHON}) + +SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_PYTHON}) + diff --git a/src/GEOM_SWIG_WITHIHM/Makefile.am b/src/GEOM_SWIG_WITHIHM/Makefile.am deleted file mode 100644 index 34bb62c8d..000000000 --- a/src/GEOM_SWIG_WITHIHM/Makefile.am +++ /dev/null @@ -1,85 +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 - -# =============================================================== -# 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 --> _libGEOM_Swig.la -# + | -# dependant libs | -# -# The files libGEOM_Swig.py and _libGEOM_Swig.so will be installed to the -# /lib/python/site-package/salome directory. -# - -SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../GEOMGUI -SWIG_SOURCES = libGEOM_Swig.i - -salomeinclude_HEADERS = $(SWIG_SOURCES) libGEOM_Swig.h - -salomepython_PYTHON = libGEOM_Swig.py -salomepyexec_LTLIBRARIES = _libGEOM_Swig.la - -_libGEOM_Swig_la_SOURCES = $(SWIG_SOURCES) libGEOM_Swig.h libGEOM_Swig.cxx -nodist__libGEOM_Swig_la_SOURCES = swig_wrap.cpp - -_libGEOM_Swig_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(PYTHON_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(OGL_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMToolsGUI \ - -I$(srcdir)/../Material \ - -I$(top_builddir)/idl - -_libGEOM_Swig_la_LDFLAGS = -module -_libGEOM_Swig_la_LIBADD = \ - ../GEOMGUI/libGEOM.la \ - ../GEOMToolsGUI/libGEOMToolsGUI.la \ - ../Material/libMaterial.la \ - $(PYTHON_LIBS) - -swig_wrap.cpp : $(SWIG_SOURCES) - $(SWIG) $(SWIG_FLAGS) -o $@ $< - -libGEOM_Swig.py: swig_wrap.cpp - -CLEANFILES = swig_wrap.cpp libGEOM_Swig.py - diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt new file mode 100755 index 000000000..d3a9891c4 --- /dev/null +++ b/src/GenerationGUI/CMakeLists.txt @@ -0,0 +1,100 @@ +# 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(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOMBase + GEOM + DlgRef + ) + +# --- headers --- + +SET(GenerationGUI_HEADERS + GenerationGUI.h + GenerationGUI_PrismDlg.h + GenerationGUI_RevolDlg.h + GenerationGUI_FillingDlg.h + GenerationGUI_PipeDlg.h + GenerationGUI_PipePathDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + GenerationGUI_PrismDlg.h + GenerationGUI_RevolDlg.h + GenerationGUI_FillingDlg.h + GenerationGUI_PipeDlg.h + GenerationGUI_PipePathDlg.h + ) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(GenerationGUI_SOURCES + GenerationGUI.cxx + GenerationGUI_PrismDlg.cxx + GenerationGUI_RevolDlg.cxx + GenerationGUI_FillingDlg.cxx + GenerationGUI_PipeDlg.cxx + GenerationGUI_PipePathDlg.cxx + ${_moc_SOURCES} + ) + +# --- rules --- + +ADD_LIBRARY(GenerationGUI ${GenerationGUI_SOURCES}) +TARGET_LINK_LIBRARIES(GenerationGUI ${_link_LIBRARIES}) +INSTALL(TARGETS GenerationGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am deleted file mode 100644 index 53dc5bc6b..000000000 --- a/src/GenerationGUI/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 -# - -# GEOM GENERATIONGUI : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : GenerationGUI - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGenerationGUI.la - -# header files -salomeinclude_HEADERS = \ - GenerationGUI.h \ - GenerationGUI_PrismDlg.h \ - GenerationGUI_RevolDlg.h \ - GenerationGUI_FillingDlg.h \ - GenerationGUI_PipeDlg.h \ - GenerationGUI_PipePathDlg.h - -dist_libGenerationGUI_la_SOURCES = \ - GenerationGUI.h \ - GenerationGUI_PrismDlg.h \ - GenerationGUI_RevolDlg.h \ - GenerationGUI_FillingDlg.h \ - GenerationGUI_PipeDlg.h \ - GenerationGUI_PipePathDlg.h \ - \ - GenerationGUI.cxx \ - GenerationGUI_PrismDlg.cxx \ - GenerationGUI_RevolDlg.cxx \ - GenerationGUI_FillingDlg.cxx \ - GenerationGUI_PipeDlg.cxx \ - GenerationGUI_PipePathDlg.cxx - -MOC_FILES = \ - GenerationGUI_PrismDlg_moc.cxx \ - GenerationGUI_RevolDlg_moc.cxx \ - GenerationGUI_FillingDlg_moc.cxx \ - GenerationGUI_PipeDlg_moc.cxx \ - GenerationGUI_PipePathDlg_moc.cxx - -nodist_libGenerationGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libGenerationGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libGenerationGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la \ - $(CAS_LDPATH) -lTKOffset diff --git a/src/GroupGUI/CMakeLists.txt b/src/GroupGUI/CMakeLists.txt new file mode 100755 index 000000000..5e71ef216 --- /dev/null +++ b/src/GroupGUI/CMakeLists.txt @@ -0,0 +1,101 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# --- headers --- + +SET(GroupGUI_HEADERS + GroupGUI.h + GroupGUI_BooleanDlg.h + GroupGUI_GroupDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + GroupGUI.h + GroupGUI_BooleanDlg.h + GroupGUI_GroupDlg.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(GroupGUI_SOURCES + GroupGUI.cxx + GroupGUI_BooleanDlg.cxx + GroupGUI_GroupDlg.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(GroupGUI ${GroupGUI_SOURCES}) +TARGET_LINK_LIBRARIES(GroupGUI ${_link_LIBRARIES}) +INSTALL(TARGETS GroupGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + + diff --git a/src/GroupGUI/Makefile.am b/src/GroupGUI/Makefile.am deleted file mode 100755 index 505f4be94..000000000 --- a/src/GroupGUI/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 -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : GroupGUI - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libGroupGUI.la - -# header files -salomeinclude_HEADERS = \ - GroupGUI.h \ - GroupGUI_BooleanDlg.h \ - GroupGUI_GroupDlg.h - -dist_libGroupGUI_la_SOURCES = \ - GroupGUI.h \ - GroupGUI_BooleanDlg.h \ - GroupGUI_GroupDlg.h \ - GroupGUI.cxx \ - GroupGUI_BooleanDlg.cxx \ - GroupGUI_GroupDlg.cxx - -MOC_FILES = \ - GroupGUI_moc.cxx \ - GroupGUI_BooleanDlg_moc.cxx \ - GroupGUI_GroupDlg_moc.cxx - -nodist_libGroupGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libGroupGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libGroupGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la diff --git a/src/IGESExport/CMakeLists.txt b/src/IGESExport/CMakeLists.txt new file mode 100755 index 000000000..f48ab860c --- /dev/null +++ b/src/IGESExport/CMakeLists.txt @@ -0,0 +1,51 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKIGES} + ${KERNEL_SALOMELocalTrace} + ) + +# --- sources --- + +SET(IGESExport_SOURCES + IGESExport.cxx + ) + +# --- rules --- + +ADD_LIBRARY(IGESExport ${IGESExport_SOURCES}) +TARGET_LINK_LIBRARIES(IGESExport ${_link_LIBRARIES}) +INSTALL(TARGETS IGESExport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + + diff --git a/src/STEPExport/Makefile.am b/src/IGESImport/CMakeLists.txt old mode 100644 new mode 100755 similarity index 54% rename from src/STEPExport/Makefile.am rename to src/IGESImport/CMakeLists.txt index 1e608fdbb..d51ed59e2 --- a/src/STEPExport/Makefile.am +++ b/src/IGESImport/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,29 +17,35 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Pavel TELKOV -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKIGES} ${CAS_TKCAF} + ${KERNEL_SALOMELocalTrace} + ) -# header files -salomeinclude_HEADERS = +# --- sources --- -# Libraries targets -lib_LTLIBRARIES = libSTEPExport.la +SET(IGESImport_SOURCES + IGESImport.cxx + ) -dist_libSTEPExport_la_SOURCES = \ - STEPExport.cxx +# --- rules --- -# additional information to compile and link file +ADD_LIBRARY(IGESImport ${IGESImport_SOURCES}) +TARGET_LINK_LIBRARIES(IGESImport ${_link_LIBRARIES}) +INSTALL(TARGETS IGESImport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -libSTEPExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) -libSTEPExport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKSTEP diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index a473cc47a..000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : src (source files directory) - -SUBDIRS = ARCHIMEDE NMTDS NMTTools BlockFix GEOMAlgo SKETCHER OCC2VTK GEOM \ - BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport \ - STLExport VTKExport ShHealOper GEOMUtils GEOMImpl GEOM_I \ - GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY - -if WITH_OPENCV - SUBDIRS += ShapeRecognition -endif - -if GEOM_ENABLE_GUI - SUBDIRS += OBJECT DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase \ - GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI \ - EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI \ - RepairGUI MeasureGUI GroupGUI BlocksGUI AdvancedGUI AdvancedEngine \ - GEOM_SWIG_WITHIHM -endif - -DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools BlockFix GEOMAlgo SKETCHER \ - OCC2VTK GEOM BREPExport BREPImport IGESExport IGESImport \ - STEPExport STEPImport STLExport VTKExport ShHealOper GEOMUtils \ - GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG OBJECT \ - DlgRef GEOMFiltersSelection Material GEOMGUI GEOMBase \ - GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI \ - EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI \ - RepairGUI MeasureGUI GroupGUI BlocksGUI AdvancedGUI \ - AdvancedEngine GEOM_SWIG_WITHIHM GEOM_PY ShapeRecognition diff --git a/src/Material/CMakeLists.txt b/src/Material/CMakeLists.txt new file mode 100755 index 000000000..c32dd4dea --- /dev/null +++ b/src/Material/CMakeLists.txt @@ -0,0 +1,89 @@ +# 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(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + ${CAS_TKBRep} + ${KERNEL_SALOMELocalTrace} + ${GUI_SalomeApp} + ) + +# --- headers --- + +SET(Material_HEADERS + Material.h + Material_Model.h + Material_ResourceMgr.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS Material_ResourceMgr.h) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(Material_SOURCES + Material_Model.cxx + Material_ResourceMgr.cxx + ${_moc_SOURCES} + ) + +# --- resources --- + +SET(Material_RESOURCES + resources/SalomeMaterial.xml + ) + +# --- rules --- + +ADD_LIBRARY(Material ${Material_SOURCES}) +TARGET_LINK_LIBRARIES(Material ${_link_LIBRARIES}) +INSTALL(TARGETS Material EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${Material_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +INSTALL(FILES ${Material_RESOURCES} DESTINATION ${SALOME_GEOM_INSTALL_RES_DATA}) diff --git a/src/Material/Makefile.am b/src/Material/Makefile.am deleted file mode 100644 index 165b4e06a..000000000 --- a/src/Material/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Margarita KARPUNINA, Open CASCADE S.A.S. (margarita.karpunina@opencascade.com) -# Package : Material -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# Libraries targets -lib_LTLIBRARIES = libMaterial.la - -# header files -salomeinclude_HEADERS = \ - Material.h \ - Material_Model.h \ - Material_ResourceMgr.h - -dist_libMaterial_la_SOURCES = \ - Material_Model.cxx \ - Material_ResourceMgr.cxx - -MOC_FILES = \ - Material_ResourceMgr_moc.cxx - -nodist_libMaterial_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file -libMaterial_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - -I$(srcdir)/../OBJECT - -libMaterial_la_LDFLAGS = -lVTKViewer -lOCCViewer -lsuit -lSalomeApp \ - ../OBJECT/libGEOMObject.la \ - $(GUI_LDFLAGS) -lqtx \ - $(QT_MT_LIBS) \ - $(CAS_LDFLAGS) -lTKV3d -lTKGeomBase \ - $(VTK_LIBS) - -dist_salomeres_DATA = resources/SalomeMaterial.xml diff --git a/src/MeasureGUI/CMakeLists.txt b/src/MeasureGUI/CMakeLists.txt new file mode 100755 index 000000000..805fc09d5 --- /dev/null +++ b/src/MeasureGUI/CMakeLists.txt @@ -0,0 +1,151 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${PROJECT_SOURCE_DIR}/src/GEOMAlgo + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + MeasureGUI_1Sel12LineEdit_QTD.ui + MeasureGUI_1Sel1TextView1Check_QTD.ui + MeasureGUI_1Sel1TextView2ListBox_QTD.ui + MeasureGUI_1Sel1TextView_QTD.ui + MeasureGUI_1Sel3LineEdit_QTD.ui + MeasureGUI_1Sel6LineEdit_QTD.ui + MeasureGUI_2Sel1LineEdit_QTD.ui + MeasureGUI_SkeletonBox_QTD.ui + ) + +# --- headers --- + +SET(MeasureGUI_HEADERS + MeasureGUI.h + MeasureGUI_Widgets.h + MeasureGUI_Skeleton.h + MeasureGUI_PropertiesDlg.h + MeasureGUI_CenterMassDlg.h + MeasureGUI_NormaleDlg.h + MeasureGUI_InertiaDlg.h + MeasureGUI_BndBoxDlg.h + MeasureGUI_DistanceDlg.h + MeasureGUI_AngleDlg.h + MeasureGUI_MaxToleranceDlg.h + MeasureGUI_WhatisDlg.h + MeasureGUI_CheckShapeDlg.h + MeasureGUI_CheckCompoundOfBlocksDlg.h + MeasureGUI_GetNonBlocksDlg.h + MeasureGUI_CheckSelfIntersectionsDlg.h + MeasureGUI_PointDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + MeasureGUI_Widgets.h + MeasureGUI_Skeleton.h + MeasureGUI_PropertiesDlg.h + MeasureGUI_CenterMassDlg.h + MeasureGUI_NormaleDlg.h + MeasureGUI_InertiaDlg.h + MeasureGUI_BndBoxDlg.h + MeasureGUI_DistanceDlg.h + MeasureGUI_AngleDlg.h + MeasureGUI_MaxToleranceDlg.h + MeasureGUI_WhatisDlg.h + MeasureGUI_CheckShapeDlg.h + MeasureGUI_CheckCompoundOfBlocksDlg.h + MeasureGUI_GetNonBlocksDlg.h + MeasureGUI_CheckSelfIntersectionsDlg.h + MeasureGUI_PointDlg.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(MeasureGUI_SOURCES + MeasureGUI.cxx + MeasureGUI_Widgets.cxx + MeasureGUI_Skeleton.cxx + MeasureGUI_PropertiesDlg.cxx + MeasureGUI_CenterMassDlg.cxx + MeasureGUI_NormaleDlg.cxx + MeasureGUI_InertiaDlg.cxx + MeasureGUI_BndBoxDlg.cxx + MeasureGUI_DistanceDlg.cxx + MeasureGUI_AngleDlg.cxx + MeasureGUI_MaxToleranceDlg.cxx + MeasureGUI_WhatisDlg.cxx + MeasureGUI_CheckShapeDlg.cxx + MeasureGUI_CheckCompoundOfBlocksDlg.cxx + MeasureGUI_GetNonBlocksDlg.cxx + MeasureGUI_CheckSelfIntersectionsDlg.cxx + MeasureGUI_PointDlg.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(MeasureGUI ${MeasureGUI_SOURCES}) +TARGET_LINK_LIBRARIES(MeasureGUI ${_link_LIBRARIES}) +INSTALL(TARGETS MeasureGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + + diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am deleted file mode 100644 index 4beb0a9fd..000000000 --- a/src/MeasureGUI/Makefile.am +++ /dev/null @@ -1,126 +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 -# - -# GEOM MEASUREGUI : -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : MeasureGUI - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - MeasureGUI.h \ - MeasureGUI_Widgets.h \ - MeasureGUI_Skeleton.h \ - MeasureGUI_PropertiesDlg.h \ - MeasureGUI_CenterMassDlg.h \ - MeasureGUI_NormaleDlg.h \ - MeasureGUI_InertiaDlg.h \ - MeasureGUI_BndBoxDlg.h \ - MeasureGUI_DistanceDlg.h \ - MeasureGUI_AngleDlg.h \ - MeasureGUI_MaxToleranceDlg.h \ - MeasureGUI_WhatisDlg.h \ - MeasureGUI_CheckShapeDlg.h \ - MeasureGUI_CheckCompoundOfBlocksDlg.h \ - MeasureGUI_GetNonBlocksDlg.h \ - MeasureGUI_CheckSelfIntersectionsDlg.h \ - MeasureGUI_PointDlg.h - -# Libraries targets -lib_LTLIBRARIES = libMeasureGUI.la - -dist_libMeasureGUI_la_SOURCES = \ - MeasureGUI.cxx \ - MeasureGUI_Widgets.cxx \ - MeasureGUI_Skeleton.cxx \ - MeasureGUI_PropertiesDlg.cxx \ - MeasureGUI_CenterMassDlg.cxx \ - MeasureGUI_NormaleDlg.cxx \ - MeasureGUI_InertiaDlg.cxx \ - MeasureGUI_BndBoxDlg.cxx \ - MeasureGUI_DistanceDlg.cxx \ - MeasureGUI_AngleDlg.cxx \ - MeasureGUI_MaxToleranceDlg.cxx \ - MeasureGUI_WhatisDlg.cxx \ - MeasureGUI_CheckShapeDlg.cxx \ - MeasureGUI_CheckCompoundOfBlocksDlg.cxx \ - MeasureGUI_GetNonBlocksDlg.cxx \ - MeasureGUI_CheckSelfIntersectionsDlg.cxx \ - MeasureGUI_PointDlg.cxx - -MOC_FILES = \ - MeasureGUI_Widgets_moc.cxx \ - MeasureGUI_Skeleton_moc.cxx \ - MeasureGUI_PropertiesDlg_moc.cxx \ - MeasureGUI_CenterMassDlg_moc.cxx \ - MeasureGUI_NormaleDlg_moc.cxx \ - MeasureGUI_InertiaDlg_moc.cxx \ - MeasureGUI_BndBoxDlg_moc.cxx \ - MeasureGUI_DistanceDlg_moc.cxx \ - MeasureGUI_AngleDlg_moc.cxx \ - MeasureGUI_MaxToleranceDlg_moc.cxx \ - MeasureGUI_WhatisDlg_moc.cxx \ - MeasureGUI_CheckShapeDlg_moc.cxx \ - MeasureGUI_CheckCompoundOfBlocksDlg_moc.cxx \ - MeasureGUI_GetNonBlocksDlg_moc.cxx \ - MeasureGUI_CheckSelfIntersectionsDlg_moc.cxx \ - MeasureGUI_PointDlg_moc.cxx - -nodist_libMeasureGUI_la_SOURCES = \ - $(MOC_FILES) - -UIC_FILES = \ - ui_MeasureGUI_1Sel12LineEdit_QTD.h \ - ui_MeasureGUI_1Sel1TextView1Check_QTD.h \ - ui_MeasureGUI_1Sel1TextView2ListBox_QTD.h \ - ui_MeasureGUI_1Sel1TextView_QTD.h \ - ui_MeasureGUI_1Sel3LineEdit_QTD.h \ - ui_MeasureGUI_1Sel6LineEdit_QTD.h \ - ui_MeasureGUI_2Sel1LineEdit_QTD.h \ - ui_MeasureGUI_SkeletonBox_QTD.h - -BUILT_SOURCES = $(UIC_FILES) - -# additional information to compile and link file - -libMeasureGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOM \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libMeasureGUI_la_LDFLAGS = \ - $(CAS_LDFLAGS) -lTKGeomBase \ - ../GEOMBase/libGEOMBase.la ../DlgRef/libDlgRef.la diff --git a/src/NMTDS/CMakeLists.txt b/src/NMTDS/CMakeLists.txt new file mode 100755 index 000000000..86ac1b81b --- /dev/null +++ b/src/NMTDS/CMakeLists.txt @@ -0,0 +1,77 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} + #${CAS_MODELER} + #${CAS_TKMesh} + ${CAS_TKBool} ${CAS_BO} + ) + +# --- headers --- + +SET(NMTDS_HEADERS + NMTDS_Tools.hxx +) + +# --- sources --- + +SET(NMTDS_SOURCES + NMTDS_BndSphere.cxx + NMTDS_BndSphereTree.cxx + NMTDS_BoxBndTree.cxx + NMTDS_CArray1OfIndexRange.cxx + NMTDS_IndexRange.cxx + NMTDS_InterfPool.cxx + NMTDS_IteratorCheckerSI.cxx + NMTDS_Iterator.cxx + NMTDS_PairBoolean.cxx + NMTDS_Pair.cxx + NMTDS_PairMapHasher.cxx + NMTDS_PassKeyBoolean.cxx + NMTDS_PassKey.cxx + NMTDS_PassKeyMapHasher.cxx + NMTDS_PassKeyShape.cxx + NMTDS_PassKeyShapeMapHasher.cxx + NMTDS_ShapesDataStructure.cxx + NMTDS_Tools.cxx + ) + +# --- rules --- + +ADD_LIBRARY(NMTDS ${NMTDS_SOURCES}) +TARGET_LINK_LIBRARIES(NMTDS ${_link_LIBRARIES}) +INSTALL(TARGETS NMTDS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${NMTDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/NMTDS/Makefile.am b/src/NMTDS/Makefile.am deleted file mode 100644 index facabf506..000000000 --- a/src/NMTDS/Makefile.am +++ /dev/null @@ -1,113 +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 -# - -# GEOM NMTAlgo : partition algorithm -# File : Makefile.in -# Author : Julia DOROVSKIKH -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - NMTDS_BndSphere.hxx \ - NMTDS_BndSphere.lxx \ - NMTDS_BndSphereTree.hxx \ - NMTDS_BoxBndTree.hxx \ - NMTDS_CArray1OfIndexRange.hxx \ - NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx \ - NMTDS_DataMapOfIntegerMapOfInteger.hxx \ - NMTDS_IndexedDataMapOfIntegerShape.hxx \ - NMTDS_IndexedDataMapOfShapeBndSphere.hxx \ - NMTDS_IndexedDataMapOfShapeBox.hxx \ - NMTDS_IndexRange.hxx \ - NMTDS_InterfPool.hxx \ - NMTDS_InterfType.hxx \ - NMTDS_IteratorCheckerSI.hxx \ - NMTDS_Iterator.hxx \ - NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx \ - NMTDS_ListIteratorOfListOfPairBoolean.hxx \ - NMTDS_ListIteratorOfListOfPair.hxx \ - NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx \ - NMTDS_ListIteratorOfListOfPassKey.hxx \ - NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx \ - NMTDS_ListOfPairBoolean.hxx \ - NMTDS_ListOfPair.hxx \ - NMTDS_ListOfPassKeyBoolean.hxx \ - NMTDS_ListOfPassKey.hxx \ - NMTDS_MapIteratorOfMapOfPairBoolean.hxx \ - NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx \ - NMTDS_MapIteratorOfMapOfPassKey.hxx \ - NMTDS_MapOfPairBoolean.hxx \ - NMTDS_MapOfPassKeyBoolean.hxx \ - NMTDS_MapOfPassKey.hxx \ - NMTDS_PairBoolean.hxx \ - NMTDS_Pair.hxx \ - NMTDS_PairMapHasher.hxx \ - NMTDS_PassKeyBoolean.hxx \ - NMTDS_PassKey.hxx \ - NMTDS_PassKeyMapHasher.hxx \ - NMTDS_PassKeyShape.hxx \ - NMTDS_PassKeyShapeMapHasher.hxx \ - NMTDS_PInterfPool.hxx \ - NMTDS_PIterator.hxx \ - NMTDS_PShapesDataStructure.hxx \ - NMTDS_ShapesDataStructure.hxx \ - NMTDS_Tools.hxx - -# Libraries targets -lib_LTLIBRARIES = libNMTDS.la - -dist_libNMTDS_la_SOURCES = \ - NMTDS_BndSphere.cxx \ - NMTDS_BndSphereTree.cxx \ - NMTDS_BoxBndTree.cxx \ - NMTDS_CArray1OfIndexRange.cxx \ - NMTDS_IndexRange.cxx \ - NMTDS_InterfPool.cxx \ - NMTDS_IteratorCheckerSI.cxx \ - NMTDS_Iterator.cxx \ - NMTDS_PairBoolean.cxx \ - NMTDS_Pair.cxx \ - NMTDS_PairMapHasher.cxx \ - NMTDS_PassKeyBoolean.cxx \ - NMTDS_PassKey.cxx \ - NMTDS_PassKeyMapHasher.cxx \ - NMTDS_PassKeyShape.cxx \ - NMTDS_PassKeyShapeMapHasher.cxx \ - NMTDS_ShapesDataStructure.cxx \ - NMTDS_Tools.cxx - -# additional information to compile and link file - -libNMTDS_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -libNMTDS_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKBool -lTKBO - -# extra dist files -CDL_FILES = NMTDS.cdl - -EXTRA_DIST += \ - $(CDL_FILES) \ - FILES diff --git a/src/NMTTools/CMakeLists.txt b/src/NMTTools/CMakeLists.txt new file mode 100755 index 000000000..42c24daf8 --- /dev/null +++ b/src/NMTTools/CMakeLists.txt @@ -0,0 +1,93 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/NMTDS + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} + ${CAS_TKBool} ${CAS_BO} + NMTDS + ) + +# --- headers --- + +SET(NMTTools_HEADERS + NMTTools_CheckerSI.hxx + NMTTools_CommonBlock.hxx + NMTTools_CommonBlockAPI.hxx + NMTTools_CommonBlockPool.hxx + NMTTools_CommonBlockPool.hxx + NMTTools_CoupleOfShape.hxx + NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx + NMTTools_ListIteratorOfListOfCommonBlock.hxx + NMTTools_ListIteratorOfListOfCoupleOfShape.hxx + NMTTools_ListIteratorOfListOfCoupleOfShape.hxx + NMTTools_ListOfCommonBlock.hxx + NMTTools_ListOfCoupleOfShape.hxx + NMTTools_PPaveFiller.hxx + NMTTools_PaveFiller.hxx + NMTTools_Tools.hxx + ) + +# --- sources --- + +SET(NMTTools_SOURCES + NMTTools_CheckerSI.cxx + NMTTools_CheckerSI_1.cxx + NMTTools_CommonBlockAPI.cxx + NMTTools_CommonBlock.cxx + NMTTools_CommonBlockPool.cxx + NMTTools_CoupleOfShape.cxx + NMTTools_DEProcessor.cxx + NMTTools_FaceInfo.cxx + NMTTools_PaveFiller_0.cxx + NMTTools_PaveFiller_1.cxx + NMTTools_PaveFiller_2.cxx + NMTTools_PaveFiller_3.cxx + NMTTools_PaveFiller_4.cxx + NMTTools_PaveFiller_5.cxx + NMTTools_PaveFiller_6.cxx + NMTTools_PaveFiller_7.cxx + NMTTools_PaveFiller_8.cxx + NMTTools_PaveFiller_9.cxx + NMTTools_PaveFiller.cxx + NMTTools_Tools.cxx + ) + +# --- rules --- + +ADD_LIBRARY(NMTTools ${NMTTools_SOURCES}) +TARGET_LINK_LIBRARIES(NMTTools ${_link_LIBRARIES}) +INSTALL(TARGETS NMTTools EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${NMTTools_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/NMTTools/Makefile.am b/src/NMTTools/Makefile.am deleted file mode 100644 index 9f097c3fb..000000000 --- a/src/NMTTools/Makefile.am +++ /dev/null @@ -1,98 +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 -# - -# GEOM NMTTools : partition algorithm -# File : Makefile.in -# Author : Julia DOROVSKIKH -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - NMTTools_CheckerSI.hxx \ - NMTTools_CommonBlockAPI.hxx \ - NMTTools_CommonBlock.hxx \ - NMTTools_CommonBlockPool.hxx \ - NMTTools_CoupleOfShape.hxx \ - NMTTools_DataMapIteratorOfDataMapOfIntegerFaceInfo.hxx \ - NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx \ - NMTTools_DataMapOfIntegerFaceInfo.hxx \ - NMTTools_DataMapOfIntegerListOfPaveBlock.hxx \ - NMTTools_DEProcessor.hxx \ - NMTTools_FaceInfo.hxx \ - NMTTools_FaceInfo.lxx \ - NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx \ - NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx \ - NMTTools_IndexedDataMapOfShapePaveBlock.hxx \ - NMTTools_ListIteratorOfListOfCommonBlock.hxx \ - NMTTools_ListIteratorOfListOfCoupleOfShape.hxx \ - NMTTools_ListOfCommonBlock.hxx \ - NMTTools_ListOfCoupleOfShape.hxx \ - NMTTools_MapIteratorOfMapOfPaveBlock.hxx \ - NMTTools_MapOfPaveBlock.hxx \ - NMTTools_PaveFiller.hxx \ - NMTTools_PPaveFiller.hxx \ - NMTTools_Tools.hxx - -# Libraries targets -lib_LTLIBRARIES = libNMTTools.la - -dist_libNMTTools_la_SOURCES = \ - NMTTools_CheckerSI.cxx \ - NMTTools_CheckerSI_1.cxx \ - NMTTools_CommonBlockAPI.cxx \ - NMTTools_CommonBlock.cxx \ - NMTTools_CommonBlockPool.cxx \ - NMTTools_CoupleOfShape.cxx \ - NMTTools_DEProcessor.cxx \ - NMTTools_FaceInfo.cxx \ - NMTTools_PaveFiller_0.cxx \ - NMTTools_PaveFiller_1.cxx \ - NMTTools_PaveFiller_2.cxx \ - NMTTools_PaveFiller_3.cxx \ - NMTTools_PaveFiller_4.cxx \ - NMTTools_PaveFiller_5.cxx \ - NMTTools_PaveFiller_6.cxx \ - NMTTools_PaveFiller_7.cxx \ - NMTTools_PaveFiller_8.cxx \ - NMTTools_PaveFiller_9.cxx \ - NMTTools_PaveFiller.cxx \ - NMTTools_Tools.cxx - -# additional information to compile and link file - -libNMTTools_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../NMTDS - -libNMTTools_la_LDFLAGS = \ - ../NMTDS/libNMTDS.la \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKBool -lTKBO \ - $(KERNEL_LDFLAGS) - -CDL_FILES = \ - NMTTools.cdl - -EXTRA_DIST += \ - $(CDL_FILES) \ - FILES diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt new file mode 100755 index 000000000..a5a01536e --- /dev/null +++ b/src/OBJECT/CMakeLists.txt @@ -0,0 +1,110 @@ +# 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(${QT_USE_FILE}) +INCLUDE(${VTK_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${VTK_INCLUDE_DIRS} + ${QT_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OCC2VTK + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + OCC2VTK + SalomeIDLGEOM + ${CAS_TKBRep} + ${KERNEL_SALOMELocalTrace} + ${GUI_SalomeObject} + ${GUI_SVTK} + ${QT_QTCORE_LIBRARY} + vtkRenderingMatplotlib + vtkInteractionStyle + #${VTK_LIBRARIES} + ) + +# --- headers --- + +SET(OBJECT_HEADERS + GEOM_Actor.h + GEOM_AISShape.hxx + GEOM_AISShape.ixx + GEOM_AISShape.jxx + Handle_GEOM_AISShape.hxx + GEOM_TopWireframeShape.hxx + GEOM_TopWireframeShape.ixx + GEOM_TopWireframeShape.jxx + Handle_GEOM_TopWireframeShape.hxx + GEOM_InteractiveObject.hxx + GEOM_InteractiveObject.ixx + GEOM_InteractiveObject.jxx + Handle_GEOM_InteractiveObject.hxx + GEOM_AISTrihedron.hxx + GEOM_VTKTrihedron.hxx + GEOM_VTKPropertyMaterial.hxx + GEOM_AISVector.hxx + GEOM_OBJECT_defs.hxx + GEOM_OCCReader.h + GEOM_SmartPtr.h + GEOM_PainterPolyDataMapper.h + GEOM_DeviceActor.h + GEOM_Constants.h + ) +# --- sources --- + +SET(OBJECT_SOURCES + GEOM_Actor.cxx + GEOM_OCCReader.cxx + GEOM_AISShape.cxx + GEOM_TopWireframeShape.cxx + GEOM_InteractiveObject.cxx + GEOM_AISTrihedron.cxx + GEOM_VTKTrihedron.cxx + GEOM_VTKPropertyMaterial.cxx + GEOM_AISVector.cxx + GEOM_PainterPolyDataMapper.cxx + GEOM_DeviceActor.cxx + GEOM_Constants.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMObject ${OBJECT_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMObject ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMObject EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${OBJECT_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am deleted file mode 100644 index 0772a2fa8..000000000 --- a/src/OBJECT/Makefile.am +++ /dev/null @@ -1,93 +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 -# - -# GEOM OBJECT : interactive object for Geometry entities visualization -# File : Makefile.in -# Author : Damien COQUERET (OCC) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - GEOM_Actor.h \ - GEOM_AISShape.hxx \ - GEOM_AISShape.ixx \ - GEOM_AISShape.jxx \ - Handle_GEOM_AISShape.hxx \ - GEOM_TopWireframeShape.hxx \ - GEOM_TopWireframeShape.ixx \ - GEOM_TopWireframeShape.jxx \ - Handle_GEOM_TopWireframeShape.hxx \ - GEOM_InteractiveObject.hxx \ - GEOM_InteractiveObject.ixx \ - GEOM_InteractiveObject.jxx \ - Handle_GEOM_InteractiveObject.hxx \ - GEOM_AISTrihedron.hxx \ - GEOM_VTKTrihedron.hxx \ - GEOM_VTKPropertyMaterial.hxx \ - GEOM_AISVector.hxx \ - GEOM_OBJECT_defs.hxx \ - GEOM_OCCReader.h \ - GEOM_SmartPtr.h \ - GEOM_PainterPolyDataMapper.h \ - GEOM_DeviceActor.h \ - GEOM_Constants.h - -# Libraries targets -lib_LTLIBRARIES = libGEOMObject.la - -dist_libGEOMObject_la_SOURCES = \ - GEOM_Actor.cxx \ - GEOM_OCCReader.cxx \ - GEOM_AISShape.cxx \ - GEOM_TopWireframeShape.cxx \ - GEOM_InteractiveObject.cxx \ - GEOM_AISTrihedron.cxx \ - GEOM_VTKTrihedron.cxx \ - GEOM_VTKPropertyMaterial.cxx \ - GEOM_AISVector.cxx \ - GEOM_PainterPolyDataMapper.cxx \ - GEOM_DeviceActor.cxx \ - GEOM_Constants.cxx - - -libGEOMObject_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(QT_INCLUDES) \ - $(PYTHON_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - -I$(srcdir)/../OCC2VTK - -libGEOMObject_la_LDFLAGS = \ - ../OCC2VTK/libOCC2VTK.la \ - $(QT_MT_LIBS) \ - $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKService \ - $(VTK_LIBS) \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(GUI_LDFLAGS) -lsuit -lqtx -lVTKViewer -lSVTK -lSalomeObject -lSalomeApp\ - $(CORBA_LIBS) -# $(STDLIB) \ -# $(PYTHON_LIBS) \ -# $(OGL_LIBS) diff --git a/src/OCC2VTK/CMakeLists.txt b/src/OCC2VTK/CMakeLists.txt new file mode 100755 index 000000000..6f239f071 --- /dev/null +++ b/src/OCC2VTK/CMakeLists.txt @@ -0,0 +1,74 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + vtkFiltersCore + ${CAS_KERNEL} + ${CAS_TKMesh} ${CAS_TKTopAlgo} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(OCC2VTK_HEADERS + OCC2VTK.h + OCC2VTK_Tools.h + GEOM_EdgeSource.h + GEOM_FaceSource.h + GEOM_ShadingFace.h + GEOM_VertexSource.h + GEOM_WireframeFace.h + ) + +# --- sources --- + +SET(OCC2VTK_SOURCES + OCC2VTK_Tools.cxx + GEOM_EdgeSource.cxx + GEOM_FaceSource.cxx + GEOM_ShadingFace.cxx + GEOM_VertexSource.cxx + GEOM_WireframeFace.cxx + ) + +# --- rules --- + +ADD_LIBRARY(OCC2VTK ${OCC2VTK_SOURCES}) +TARGET_LINK_LIBRARIES(OCC2VTK ${_link_LIBRARIES}) +INSTALL(TARGETS OCC2VTK EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${OCC2VTK_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + + diff --git a/src/OCC2VTK/Makefile.am b/src/OCC2VTK/Makefile.am deleted file mode 100644 index 27514352c..000000000 --- a/src/OCC2VTK/Makefile.am +++ /dev/null @@ -1,51 +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 - -# header files -salomeinclude_HEADERS = \ - OCC2VTK.h \ - OCC2VTK_Tools.h \ - GEOM_EdgeSource.h \ - GEOM_FaceSource.h \ - GEOM_ShadingFace.h \ - GEOM_VertexSource.h \ - GEOM_WireframeFace.h - -# Libraries targets -lib_LTLIBRARIES = libOCC2VTK.la - -dist_libOCC2VTK_la_SOURCES = \ - OCC2VTK_Tools.cxx \ - GEOM_EdgeSource.cxx \ - GEOM_FaceSource.cxx \ - GEOM_ShadingFace.cxx \ - GEOM_VertexSource.cxx \ - GEOM_WireframeFace.cxx - -libOCC2VTK_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) - -libOCC2VTK_la_LDFLAGS = \ - $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKService \ - $(VTK_LIBS) \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace diff --git a/src/OperationGUI/CMakeLists.txt b/src/OperationGUI/CMakeLists.txt new file mode 100755 index 000000000..4a11d1bec --- /dev/null +++ b/src/OperationGUI/CMakeLists.txt @@ -0,0 +1,120 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${PROJECT_SOURCE_DIR}/src/GEOMAlgo + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# --- headers --- + +SET(OperationGUI_HEADERS + OperationGUI.h + OperationGUI_ArchimedeDlg.h + OperationGUI_PartitionDlg.h + OperationGUI_FilletDlg.h + OperationGUI_Fillet1d2dDlg.h + OperationGUI_ChamferDlg.h + OperationGUI_GetShapesOnShapeDlg.h + OperationGUI_GetSharedShapesDlg.h + OperationGUI_ExtrudedFeatureDlg.h + OperationGUI_ClippingDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + OperationGUI_ArchimedeDlg.h + OperationGUI_PartitionDlg.h + OperationGUI_FilletDlg.h + OperationGUI_Fillet1d2dDlg.h + OperationGUI_ChamferDlg.h + OperationGUI_GetShapesOnShapeDlg.h + OperationGUI_GetSharedShapesDlg.h + OperationGUI_ExtrudedFeatureDlg.h + OperationGUI_ClippingDlg.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(OperationGUI_SOURCES + OperationGUI.cxx + OperationGUI_ArchimedeDlg.cxx + OperationGUI_PartitionDlg.cxx + OperationGUI_GetShapesOnShapeDlg.cxx + OperationGUI_GetSharedShapesDlg.cxx + OperationGUI_FilletDlg.cxx + OperationGUI_Fillet1d2dDlg.cxx + OperationGUI_ChamferDlg.cxx + OperationGUI_ExtrudedFeatureDlg.cxx + OperationGUI_ClippingDlg.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(OperationGUI ${OperationGUI_SOURCES}) +TARGET_LINK_LIBRARIES(OperationGUI ${_link_LIBRARIES}) +INSTALL(TARGETS OperationGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am deleted file mode 100644 index e41891a0b..000000000 --- a/src/OperationGUI/Makefile.am +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : OperationGUI - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - OperationGUI.h \ - OperationGUI_ArchimedeDlg.h \ - OperationGUI_PartitionDlg.h \ - OperationGUI_FilletDlg.h \ - OperationGUI_Fillet1d2dDlg.h \ - OperationGUI_ChamferDlg.h \ - OperationGUI_GetShapesOnShapeDlg.h \ - OperationGUI_GetSharedShapesDlg.h \ - OperationGUI_ExtrudedFeatureDlg.h \ - OperationGUI_ClippingDlg.h - -# Libraries targets -lib_LTLIBRARIES = libOperationGUI.la - -dist_libOperationGUI_la_SOURCES = \ - OperationGUI.cxx \ - OperationGUI_ArchimedeDlg.cxx \ - OperationGUI_PartitionDlg.cxx \ - OperationGUI_GetShapesOnShapeDlg.cxx \ - OperationGUI_GetSharedShapesDlg.cxx \ - OperationGUI_FilletDlg.cxx \ - OperationGUI_Fillet1d2dDlg.cxx \ - OperationGUI_ChamferDlg.cxx \ - OperationGUI_ExtrudedFeatureDlg.cxx \ - OperationGUI_ClippingDlg.cxx - -MOC_FILES = \ - OperationGUI_ArchimedeDlg_moc.cxx \ - OperationGUI_PartitionDlg_moc.cxx \ - OperationGUI_GetShapesOnShapeDlg_moc.cxx\ - OperationGUI_GetSharedShapesDlg_moc.cxx \ - OperationGUI_FilletDlg_moc.cxx \ - OperationGUI_Fillet1d2dDlg_moc.cxx \ - OperationGUI_ChamferDlg_moc.cxx \ - OperationGUI_ExtrudedFeatureDlg_moc.cxx \ - OperationGUI_ClippingDlg_moc.cxx - -nodist_libOperationGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libOperationGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(OPENCV_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMAlgo \ - -I$(srcdir)/../GEOM \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - - -libOperationGUI_la_LDFLAGS = \ - ../GEOMBase/libGEOMBase.la \ - $(CAS_LDPATH) -lTKFillet \ - $(OPENCV_LIBS) -############################### -# Obsolete files ? -############################### -# OperationGUI_MaterialDlg.h -# OperationGUI_MaterialDlg.cxx diff --git a/src/PrimitiveGUI/CMakeLists.txt b/src/PrimitiveGUI/CMakeLists.txt new file mode 100755 index 000000000..9c7fb7b39 --- /dev/null +++ b/src/PrimitiveGUI/CMakeLists.txt @@ -0,0 +1,105 @@ +# 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(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMObject + GEOMClient + GEOMImpl + GEOMBase + GEOM + DlgRef + ) + +# --- headers --- + +SET(PrimitiveGUI_HEADERS + PrimitiveGUI.h + PrimitiveGUI_BoxDlg.h + PrimitiveGUI_CylinderDlg.h + PrimitiveGUI_SphereDlg.h + PrimitiveGUI_TorusDlg.h + PrimitiveGUI_ConeDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + PrimitiveGUI_BoxDlg.h + PrimitiveGUI_CylinderDlg.h + PrimitiveGUI_SphereDlg.h + PrimitiveGUI_TorusDlg.h + PrimitiveGUI_ConeDlg.h + PrimitiveGUI_FaceDlg.h + PrimitiveGUI_DiskDlg.h + ) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(PrimitiveGUI_SOURCES + PrimitiveGUI.cxx + PrimitiveGUI_BoxDlg.cxx + PrimitiveGUI_CylinderDlg.cxx + PrimitiveGUI_SphereDlg.cxx + PrimitiveGUI_TorusDlg.cxx + PrimitiveGUI_ConeDlg.cxx + PrimitiveGUI_FaceDlg.cxx + PrimitiveGUI_DiskDlg.cxx + ${_moc_SOURCES} + ) + +# --- rules --- + +ADD_LIBRARY(PrimitiveGUI ${PrimitiveGUI_SOURCES}) +TARGET_LINK_LIBRARIES(PrimitiveGUI ${_link_LIBRARIES}) +INSTALL(TARGETS PrimitiveGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + diff --git a/src/PrimitiveGUI/Makefile.am b/src/PrimitiveGUI/Makefile.am deleted file mode 100644 index 68ad81d2b..000000000 --- a/src/PrimitiveGUI/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : PrimitiveGUI -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - PrimitiveGUI.h \ - PrimitiveGUI_BoxDlg.h \ - PrimitiveGUI_CylinderDlg.h \ - PrimitiveGUI_SphereDlg.h \ - PrimitiveGUI_TorusDlg.h \ - PrimitiveGUI_ConeDlg.h - -# Libraries targets -lib_LTLIBRARIES = libPrimitiveGUI.la - -dist_libPrimitiveGUI_la_SOURCES = \ - PrimitiveGUI.h \ - PrimitiveGUI_BoxDlg.h \ - PrimitiveGUI_ConeDlg.h \ - PrimitiveGUI_CylinderDlg.h \ - PrimitiveGUI_SphereDlg.h \ - PrimitiveGUI_TorusDlg.h \ - PrimitiveGUI_FaceDlg.h \ - PrimitiveGUI_DiskDlg.h \ - \ - PrimitiveGUI.cxx \ - PrimitiveGUI_BoxDlg.cxx \ - PrimitiveGUI_CylinderDlg.cxx \ - PrimitiveGUI_SphereDlg.cxx \ - PrimitiveGUI_TorusDlg.cxx \ - PrimitiveGUI_ConeDlg.cxx \ - PrimitiveGUI_FaceDlg.cxx \ - PrimitiveGUI_DiskDlg.cxx - -MOC_FILES = \ - PrimitiveGUI_BoxDlg_moc.cxx \ - PrimitiveGUI_CylinderDlg_moc.cxx \ - PrimitiveGUI_SphereDlg_moc.cxx \ - PrimitiveGUI_TorusDlg_moc.cxx \ - PrimitiveGUI_ConeDlg_moc.cxx \ - PrimitiveGUI_FaceDlg_moc.cxx \ - PrimitiveGUI_DiskDlg_moc.cxx - -nodist_libPrimitiveGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libPrimitiveGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libPrimitiveGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la diff --git a/src/RepairGUI/CMakeLists.txt b/src/RepairGUI/CMakeLists.txt new file mode 100755 index 000000000..1e164db82 --- /dev/null +++ b/src/RepairGUI/CMakeLists.txt @@ -0,0 +1,141 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${PROJECT_SOURCE_DIR}/src/GEOMAlgo + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# --- headers --- + +SET(RepairGUI_HEADERS + RepairGUI.h + RepairGUI_SewingDlg.h + RepairGUI_SuppressFacesDlg.h + RepairGUI_ShapeProcessDlg.h + RepairGUI_CloseContourDlg.h + RepairGUI_RemoveIntWiresDlg.h + RepairGUI_RemoveHolesDlg.h + RepairGUI_DivideEdgeDlg.h + RepairGUI_FreeBoundDlg.h + RepairGUI_FreeFacesDlg.h + RepairGUI_ChangeOrientationDlg.h + RepairGUI_GlueDlg.h + RepairGUI_LimitToleranceDlg.h + RepairGUI_RemoveWebsDlg.h + RepairGUI_RemoveExtraEdgesDlg.h + RepairGUI_UnionFacesDlg.h + RepairGUI_FuseEdgesDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + RepairGUI_SewingDlg.h + RepairGUI_SuppressFacesDlg.h + RepairGUI_ShapeProcessDlg.h + RepairGUI_CloseContourDlg.h + RepairGUI_RemoveIntWiresDlg.h + RepairGUI_RemoveHolesDlg.h + RepairGUI_DivideEdgeDlg.h + RepairGUI_FreeBoundDlg.h + RepairGUI_FreeFacesDlg.h + RepairGUI_ChangeOrientationDlg.h + RepairGUI_GlueDlg.h + RepairGUI_LimitToleranceDlg.h + RepairGUI_RemoveWebsDlg.h + RepairGUI_RemoveExtraEdgesDlg.h + RepairGUI_UnionFacesDlg.h + RepairGUI_FuseEdgesDlg.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(RepairGUI_SOURCES + RepairGUI.cxx + RepairGUI_SewingDlg.cxx + RepairGUI_SuppressFacesDlg.cxx + RepairGUI_ShapeProcessDlg.cxx + RepairGUI_CloseContourDlg.cxx + RepairGUI_RemoveIntWiresDlg.cxx + RepairGUI_RemoveHolesDlg.cxx + RepairGUI_DivideEdgeDlg.cxx + RepairGUI_FreeBoundDlg.cxx + RepairGUI_FreeFacesDlg.cxx + RepairGUI_ChangeOrientationDlg.cxx + RepairGUI_GlueDlg.cxx + RepairGUI_LimitToleranceDlg.cxx + RepairGUI_RemoveWebsDlg.cxx + RepairGUI_RemoveExtraEdgesDlg.cxx + RepairGUI_UnionFacesDlg.cxx + RepairGUI_FuseEdgesDlg.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(RepairGUI ${RepairGUI_SOURCES}) +TARGET_LINK_LIBRARIES(RepairGUI ${_link_LIBRARIES}) +INSTALL(TARGETS RepairGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/RepairGUI/Makefile.am b/src/RepairGUI/Makefile.am deleted file mode 100644 index adec8540e..000000000 --- a/src/RepairGUI/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : RepairGUI - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - RepairGUI.h \ - RepairGUI_SewingDlg.h \ - RepairGUI_SuppressFacesDlg.h \ - RepairGUI_ShapeProcessDlg.h \ - RepairGUI_CloseContourDlg.h \ - RepairGUI_RemoveIntWiresDlg.h \ - RepairGUI_RemoveHolesDlg.h \ - RepairGUI_DivideEdgeDlg.h \ - RepairGUI_FreeBoundDlg.h \ - RepairGUI_FreeFacesDlg.h \ - RepairGUI_ChangeOrientationDlg.h \ - RepairGUI_GlueDlg.h \ - RepairGUI_LimitToleranceDlg.h \ - RepairGUI_RemoveWebsDlg.h \ - RepairGUI_RemoveExtraEdgesDlg.h \ - RepairGUI_UnionFacesDlg.h \ - RepairGUI_FuseEdgesDlg.h - -# Libraries targets -lib_LTLIBRARIES = libRepairGUI.la - -dist_libRepairGUI_la_SOURCES = \ - RepairGUI.h \ - RepairGUI_SewingDlg.h \ - RepairGUI_SuppressFacesDlg.h \ - RepairGUI_ShapeProcessDlg.h \ - RepairGUI_CloseContourDlg.h \ - RepairGUI_RemoveIntWiresDlg.h \ - RepairGUI_RemoveHolesDlg.h \ - RepairGUI_DivideEdgeDlg.h \ - RepairGUI_FreeBoundDlg.h \ - RepairGUI_FreeFacesDlg.h \ - RepairGUI_ChangeOrientationDlg.h \ - RepairGUI_GlueDlg.h \ - RepairGUI_LimitToleranceDlg.h \ - RepairGUI_RemoveWebsDlg.h \ - RepairGUI_RemoveExtraEdgesDlg.h \ - RepairGUI_UnionFacesDlg.h \ - RepairGUI_FuseEdgesDlg.h \ - \ - RepairGUI.cxx \ - RepairGUI_SewingDlg.cxx \ - RepairGUI_SuppressFacesDlg.cxx \ - RepairGUI_ShapeProcessDlg.cxx \ - RepairGUI_CloseContourDlg.cxx \ - RepairGUI_RemoveIntWiresDlg.cxx \ - RepairGUI_RemoveHolesDlg.cxx \ - RepairGUI_DivideEdgeDlg.cxx \ - RepairGUI_FreeBoundDlg.cxx \ - RepairGUI_FreeFacesDlg.cxx \ - RepairGUI_ChangeOrientationDlg.cxx \ - RepairGUI_GlueDlg.cxx \ - RepairGUI_LimitToleranceDlg.cxx \ - RepairGUI_RemoveWebsDlg.cxx \ - RepairGUI_RemoveExtraEdgesDlg.cxx \ - RepairGUI_UnionFacesDlg.cxx \ - RepairGUI_FuseEdgesDlg.cxx - -MOC_FILES = \ - RepairGUI_SewingDlg_moc.cxx \ - RepairGUI_SuppressFacesDlg_moc.cxx \ - RepairGUI_ShapeProcessDlg_moc.cxx \ - RepairGUI_CloseContourDlg_moc.cxx \ - RepairGUI_RemoveIntWiresDlg_moc.cxx \ - RepairGUI_RemoveHolesDlg_moc.cxx \ - RepairGUI_DivideEdgeDlg_moc.cxx \ - RepairGUI_FreeBoundDlg_moc.cxx \ - RepairGUI_FreeFacesDlg_moc.cxx \ - RepairGUI_ChangeOrientationDlg_moc.cxx \ - RepairGUI_GlueDlg_moc.cxx \ - RepairGUI_LimitToleranceDlg_moc.cxx \ - RepairGUI_RemoveWebsDlg_moc.cxx \ - RepairGUI_RemoveExtraEdgesDlg_moc.cxx \ - RepairGUI_UnionFacesDlg_moc.cxx \ - RepairGUI_FuseEdgesDlg_moc.cxx - -nodist_libRepairGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libRepairGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libRepairGUI_la_LDFLAGS = \ - ../GEOMBase/libGEOMBase.la diff --git a/src/SKETCHER/CMakeLists.txt b/src/SKETCHER/CMakeLists.txt new file mode 100755 index 000000000..39f595173 --- /dev/null +++ b/src/SKETCHER/CMakeLists.txt @@ -0,0 +1,60 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} + ${CAS_TKGeomAlgo} ${CAS_TKTopAlgo} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(SKETCHER_HEADERS + Sketcher_Profile.hxx + ) + +# --- sources --- + +SET(SKETCHER_SOURCES + Sketcher_Profile.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMSketcher ${SKETCHER_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMSketcher ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMSketcher EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SKETCHER_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + + diff --git a/src/SKETCHER/Makefile.am b/src/SKETCHER/Makefile.am deleted file mode 100644 index e2b6b6a2f..000000000 --- a/src/SKETCHER/Makefile.am +++ /dev/null @@ -1,48 +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 -# - -# GEOM SKETCHER : basic sketcher -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - Sketcher_Profile.hxx - -# Libraries targets -lib_LTLIBRARIES = libGEOMSketcher.la - -dist_libGEOMSketcher_la_SOURCES = \ - Sketcher_Profile.cxx - -# additional information to compile and link file - -libGEOMSketcher_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -libGEOMSketcher_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ - $(CAS_KERNEL) \ - $(CAS_MODELER) diff --git a/src/STEPExport/CMakeLists.txt b/src/STEPExport/CMakeLists.txt new file mode 100755 index 000000000..80c765266 --- /dev/null +++ b/src/STEPExport/CMakeLists.txt @@ -0,0 +1,51 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKSTEP} + ${KERNEL_SALOMELocalTrace} + ) + +# --- sources --- + +SET(STEPExport_SOURCES + STEPExport.cxx + ) + +# --- rules --- + +ADD_LIBRARY(STEPExport ${STEPExport_SOURCES}) +TARGET_LINK_LIBRARIES(STEPExport ${_link_LIBRARIES}) +INSTALL(TARGETS STEPExport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + + diff --git a/src/STEPImport/CMakeLists.txt b/src/STEPImport/CMakeLists.txt new file mode 100755 index 000000000..27769a27d --- /dev/null +++ b/src/STEPImport/CMakeLists.txt @@ -0,0 +1,51 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKSTEP} ${CAS_TKCAF} + ${KERNEL_SALOMELocalTrace} + ) + +# --- sources --- + +SET(STEPImport_SOURCES + STEPImport.cxx + ) + +# --- rules --- + +ADD_LIBRARY(STEPImport ${STEPImport_SOURCES}) +TARGET_LINK_LIBRARIES(STEPImport ${_link_LIBRARIES}) +INSTALL(TARGETS STEPImport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + + diff --git a/src/VTKExport/Makefile.am b/src/STLExport/CMakeLists.txt old mode 100644 new mode 100755 similarity index 55% rename from src/VTKExport/Makefile.am rename to src/STLExport/CMakeLists.txt index 14b617e09..4adbd16e2 --- a/src/VTKExport/Makefile.am +++ b/src/STLExport/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,27 +17,35 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# --- options --- -# header files -salomeinclude_HEADERS = +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ) -# Libraries targets -lib_LTLIBRARIES = libVTKExport.la +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) -dist_libVTKExport_la_SOURCES = \ - VTKExport.cxx +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKSTL} + ${KERNEL_SALOMELocalTrace} + ) -# additional information to compile and link file +# --- sources --- + +SET(STLExport_SOURCES + STLExport.cxx + ) + +# --- rules --- + +ADD_LIBRARY(STLExport ${STLExport_SOURCES}) +TARGET_LINK_LIBRARIES(STLExport ${_link_LIBRARIES}) +INSTALL(TARGETS STLExport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -libVTKExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../OCC2VTK -libVTKExport_la_LDFLAGS = \ - ../OCC2VTK/libOCC2VTK.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \ - $(STDLIB) \ - $(CAS_LDPATH) diff --git a/src/ShHealOper/CMakeLists.txt b/src/ShHealOper/CMakeLists.txt new file mode 100755 index 000000000..88271dd7e --- /dev/null +++ b/src/ShHealOper/CMakeLists.txt @@ -0,0 +1,78 @@ +# 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( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKCAF} ${CAS_TKShHealing} ${CAS_TKBool} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(ShHealOper_HEADERS + ShHealOper_CloseContour.hxx + ShHealOper_EdgeDivide.hxx + ShHealOper_FillHoles.hxx + ShHealOper_RemoveFace.hxx + ShHealOper_RemoveInternalWires.hxx + ShHealOper_Sewing.hxx + ShHealOper_ShapeProcess.hxx + ShHealOper_SpiltCurve2d.hxx + ShHealOper_SplitCurve2d.hxx + ShHealOper_SplitCurve3d.hxx + ShHealOper_ChangeOrientation.hxx + ShHealOper_Tool.hxx + ) +# --- sources --- + +SET(ShHealOper_SOURCES + ShHealOper_CloseContour.cxx + ShHealOper_EdgeDivide.cxx + ShHealOper_FillHoles.cxx + ShHealOper_RemoveFace.cxx + ShHealOper_RemoveInternalWires.cxx + ShHealOper_Sewing.cxx + ShHealOper_ShapeProcess.cxx + ShHealOper_SplitCurve2d.cxx + ShHealOper_SplitCurve3d.cxx + ShHealOper_ChangeOrientation.cxx + ShHealOper_Tool.cxx + ) + +# --- rules --- + +ADD_LIBRARY(ShHealOper ${ShHealOper_SOURCES}) +TARGET_LINK_LIBRARIES(ShHealOper ${_link_LIBRARIES}) +INSTALL(TARGETS ShHealOper EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${ShHealOper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/ShHealOper/Makefile.am b/src/ShHealOper/Makefile.am deleted file mode 100644 index 677e98d98..000000000 --- a/src/ShHealOper/Makefile.am +++ /dev/null @@ -1,70 +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 -# - -# GEOM ShHealOper : Shape Healing -# File : Makefile.in -# Author : Alexander SLADKOV -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - ShHealOper_CloseContour.hxx \ - ShHealOper_EdgeDivide.hxx \ - ShHealOper_FillHoles.hxx \ - ShHealOper_RemoveFace.hxx \ - ShHealOper_RemoveInternalWires.hxx \ - ShHealOper_Sewing.hxx \ - ShHealOper_ShapeProcess.hxx \ - ShHealOper_SpiltCurve2d.hxx \ - ShHealOper_SplitCurve2d.hxx \ - ShHealOper_SplitCurve3d.hxx \ - ShHealOper_ChangeOrientation.hxx \ - ShHealOper_Tool.hxx - -# Libraries targets -lib_LTLIBRARIES = libShHealOper.la - -dist_libShHealOper_la_SOURCES = \ - ShHealOper_CloseContour.cxx \ - ShHealOper_EdgeDivide.cxx \ - ShHealOper_FillHoles.cxx \ - ShHealOper_RemoveFace.cxx \ - ShHealOper_RemoveInternalWires.cxx \ - ShHealOper_Sewing.cxx \ - ShHealOper_ShapeProcess.cxx \ - ShHealOper_SplitCurve2d.cxx \ - ShHealOper_SplitCurve3d.cxx \ - ShHealOper_ChangeOrientation.cxx \ - ShHealOper_Tool.cxx - -# additional information to compile and link file - -libShHealOper_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -libShHealOper_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_KERNEL) \ - $(CAS_MATH) \ - $(CAS_TKTopAlgo) \ - $(CAS_LDPATH) -lTKBool -lTKShHealing -lTKCAF -lTKLCAF diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt new file mode 100755 index 000000000..74eaf0170 --- /dev/null +++ b/src/ShapeRecognition/CMakeLists.txt @@ -0,0 +1,66 @@ +# 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( ${QT_USE_FILE} ) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + #${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${OPENCV_INCLUDE_DIR} + ${QT_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + #${CAS_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + ${OpenCV_LIBS} + ${QT_QTCORE_LIBRARY} # ${QT_LIBRARIES} + ${KERNEL_SALOMELocalTrace} + ) + +# --- headers --- + +SET(ShapeRecognition_HEADERS + ShapeRec_FeatureDetector.hxx + ) + +# --- sources --- + +SET(ShapeRecognition_SOURCES + ShapeRec_FeatureDetector.cxx + ) + +# --- rules --- + +ADD_LIBRARY(GEOMShapeRec ${ShapeRecognition_SOURCES}) +TARGET_LINK_LIBRARIES(GEOMShapeRec ${_link_LIBRARIES}) +INSTALL(TARGETS GEOMShapeRec EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +#INSTALL(FILES ${ShapeRecognition_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + + diff --git a/src/ShapeRecognition/Makefile.am b/src/ShapeRecognition/Makefile.am deleted file mode 100644 index 09fbca5b6..000000000 --- a/src/ShapeRecognition/Makefile.am +++ /dev/null @@ -1,50 +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 -# - -# GEOM ShapeRecognition : tools for the shape recognition -# File : Makefile.am -# Author : Renaud NEDELEC (OCC) -# Module : GEOM -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - ShapeRec_FeatureDetector.hxx - -# Libraries targets -lib_LTLIBRARIES = libGEOMShapeRec.la - -dist_libGEOMShapeRec_la_SOURCES = \ - ShapeRec_FeatureDetector.cxx - -# additional information to compile and link file - -libGEOMShapeRec_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS)\ - $(OPENCV_INCLUDES)\ - $(QT_INCLUDES) - - -libGEOMShapeRec_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ - $(OPENCV_LIBS) \ - $(QT_MT_LIBS) diff --git a/src/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt new file mode 100755 index 000000000..658cc3ab1 --- /dev/null +++ b/src/TransformationGUI/CMakeLists.txt @@ -0,0 +1,119 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +#INCLUDE(UseQt4Ext) +INCLUDE(${QT_USE_FILE}) + +# --- options --- + +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/GEOMClient + ${PROJECT_SOURCE_DIR}/src/GEOMImpl + ${PROJECT_SOURCE_DIR}/src/GEOMGUI + ${PROJECT_SOURCE_DIR}/src/GEOMBase + ${PROJECT_SOURCE_DIR}/src/DlgRef + ${PROJECT_BINARY_DIR}/src/DlgRef + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${QT_DEFINITIONS} + ) + +# libraries to link to +SET(_link_LIBRARIES + GEOMBase + ) + +# --- resources --- + +# resource files / to be processed by uic +SET(_uic_files + ) + +# --- headers --- + +SET(TransformationGUI_HEADERS + TransformationGUI.h + TransformationGUI_MultiTranslationDlg.h + TransformationGUI_MultiRotationDlg.h + TransformationGUI_TranslationDlg.h + TransformationGUI_RotationDlg.h + TransformationGUI_MirrorDlg.h + TransformationGUI_ScaleDlg.h + TransformationGUI_OffsetDlg.h + TransformationGUI_ProjectionDlg.h + TransformationGUI_PositionDlg.h + ) + +# header files / to be processed by moc +SET(_moc_HEADERS + TransformationGUI_MultiTranslationDlg.h + TransformationGUI_MultiRotationDlg.h + TransformationGUI_TranslationDlg.h + TransformationGUI_RotationDlg.h + TransformationGUI_MirrorDlg.h + TransformationGUI_ScaleDlg.h + TransformationGUI_OffsetDlg.h + TransformationGUI_ProjectionDlg.h + TransformationGUI_PositionDlg.h + ) + +# header files / uic wrappings +QT4_WRAP_UI(_uic_HEADERS ${_uic_files}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +SET(TransformationGUI_SOURCES + TransformationGUI.cxx + TransformationGUI_MultiTranslationDlg.cxx + TransformationGUI_MultiRotationDlg.cxx + TransformationGUI_TranslationDlg.cxx + TransformationGUI_RotationDlg.cxx + TransformationGUI_MirrorDlg.cxx + TransformationGUI_ScaleDlg.cxx + TransformationGUI_OffsetDlg.cxx + TransformationGUI_ProjectionDlg.cxx + TransformationGUI_PositionDlg.cxx + ${_moc_SOURCES} + ${_uic_files} + ) + +# --- rules --- + +ADD_LIBRARY(TransformationGUI ${TransformationGUI_SOURCES}) +TARGET_LINK_LIBRARIES(TransformationGUI ${_link_LIBRARIES}) +INSTALL(TARGETS TransformationGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/TransformationGUI/Makefile.am b/src/TransformationGUI/Makefile.am deleted file mode 100644 index bdc5340c0..000000000 --- a/src/TransformationGUI/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) -# Package : TransformationGUI - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - TransformationGUI.h \ - TransformationGUI_MultiTranslationDlg.h \ - TransformationGUI_MultiRotationDlg.h \ - TransformationGUI_TranslationDlg.h \ - TransformationGUI_RotationDlg.h \ - TransformationGUI_MirrorDlg.h \ - TransformationGUI_ScaleDlg.h \ - TransformationGUI_OffsetDlg.h \ - TransformationGUI_ProjectionDlg.h \ - TransformationGUI_PositionDlg.h - -# Libraries targets -lib_LTLIBRARIES = libTransformationGUI.la - -dist_libTransformationGUI_la_SOURCES = \ - TransformationGUI.h \ - TransformationGUI_MultiTranslationDlg.h \ - TransformationGUI_MultiRotationDlg.h \ - TransformationGUI_TranslationDlg.h \ - TransformationGUI_RotationDlg.h \ - TransformationGUI_MirrorDlg.h \ - TransformationGUI_ScaleDlg.h \ - TransformationGUI_OffsetDlg.h \ - TransformationGUI_ProjectionDlg.h \ - TransformationGUI_PositionDlg.h \ - \ - TransformationGUI.cxx \ - TransformationGUI_MultiTranslationDlg.cxx \ - TransformationGUI_MultiRotationDlg.cxx \ - TransformationGUI_TranslationDlg.cxx \ - TransformationGUI_RotationDlg.cxx \ - TransformationGUI_MirrorDlg.cxx \ - TransformationGUI_ScaleDlg.cxx \ - TransformationGUI_OffsetDlg.cxx \ - TransformationGUI_ProjectionDlg.cxx \ - TransformationGUI_PositionDlg.cxx - -MOC_FILES = \ - TransformationGUI_MultiTranslationDlg_moc.cxx \ - TransformationGUI_MultiRotationDlg_moc.cxx \ - TransformationGUI_TranslationDlg_moc.cxx \ - TransformationGUI_RotationDlg_moc.cxx \ - TransformationGUI_MirrorDlg_moc.cxx \ - TransformationGUI_ScaleDlg_moc.cxx \ - TransformationGUI_OffsetDlg_moc.cxx \ - TransformationGUI_ProjectionDlg_moc.cxx \ - TransformationGUI_PositionDlg_moc.cxx - -nodist_libTransformationGUI_la_SOURCES = \ - $(MOC_FILES) - -# additional information to compile and link file - -libTransformationGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../DlgRef \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMFiltersSelection \ - -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl - -libTransformationGUI_la_LDFLAGS = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ - ../GEOMBase/libGEOMBase.la \ - $(CAS_LDPATH) -lTKShHealing diff --git a/src/STEPImport/Makefile.am b/src/VTKExport/CMakeLists.txt old mode 100644 new mode 100755 similarity index 52% rename from src/STEPImport/Makefile.am rename to src/VTKExport/CMakeLists.txt index 29801a3ea..eac70b5a6 --- a/src/STEPImport/Makefile.am +++ b/src/VTKExport/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# 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 @@ -17,29 +17,38 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : Makefile.in -# Author : Pavel TELKOV -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : GEOM +# --- options --- -include $(top_srcdir)/adm_local/unix/make_common_starter.am +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/OCC2VTK + ) -# header files -salomeinclude_HEADERS = +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ) -# Libraries targets -lib_LTLIBRARIES = libSTEPImport.la +# libraries to link to +SET(_link_LIBRARIES + vtkIOLegacy + OCC2VTK + ${KERNEL_SALOMELocalTrace} + ) -dist_libSTEPImport_la_SOURCES = \ - STEPImport.cxx +# --- sources --- -# additional information to compile and link file +SET(VTKExport_SOURCES + VTKExport.cxx + ) + +# --- rules --- + +ADD_LIBRARY(VTKExport ${VTKExport_SOURCES}) +TARGET_LINK_LIBRARIES(VTKExport ${_link_LIBRARIES}) +INSTALL(TARGETS VTKExport EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -libSTEPImport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) -libSTEPImport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKSTEP -lTKCAF -lTKLCAF -lTKSTEPBase -- 2.39.2