From 442b0930ae66eebf2ffbacc05004a50fddc97601 Mon Sep 17 00:00:00 2001 From: Gerald NICOLAS Date: Mon, 15 Jan 2018 11:41:16 +0100 Subject: [PATCH] Pilotage --- CMakeLists.txt | 2 +- SalomeHOMARDConfig.cmake.in | 13 +++++++------ resources/CMakeLists.txt | 1 + resources/HOMARDCatalog.xml.in | 10 ++++++++++ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2267228f..bf7e5bc3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -287,7 +287,7 @@ 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 - HOMARDImpl HOMARDEngine HOMARD SalomeIDLHOMARD + HOMARDImpl HOMARDEngine HOMARD SalomeIDLHOMARD FrontTrack ) # Add all targets to the build-tree export set diff --git a/SalomeHOMARDConfig.cmake.in b/SalomeHOMARDConfig.cmake.in index 7ad0e808..83ab5bf3 100644 --- a/SalomeHOMARDConfig.cmake.in +++ b/SalomeHOMARDConfig.cmake.in @@ -18,7 +18,7 @@ # # - Config file for the @PROJECT_NAME@ package -# It defines the following variables. +# 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 # @@ -26,12 +26,12 @@ ### 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 +# 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 HOMARDEngine AND NOT @PROJECT_NAME@_BINARY_DIR) INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") -ENDIF() +ENDIF() # Package root dir: SET_AND_CHECK(HOMARD_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") @@ -94,7 +94,7 @@ SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") -SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") @@ -103,12 +103,13 @@ SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") # Include SMESH targets if they were not already loaded: -IF(NOT (TARGET SMESHEngine)) +IF(NOT (TARGET SMESHEngine)) INCLUDE("${SMESH_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeSMESHTargets.cmake") ENDIF() # Exposed HOMARD targets: SET(HOMARD_HOMARDImpl HOMARDImpl) +SET(HOMARD_FrontTrack FrontTrack) SET(HOMARD_HOMARDEngine HOMARDEngine) SET(HOMARD_HOMARD HOMARD) SET(HOMARD_SalomeIDLHOMARD SalomeIDLHOMARD) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index d454a9f8..413503d3 100755 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -38,6 +38,7 @@ SET(HOMARD_RESOURCES_FILES diskwithhole.png diskwithhole_2.png full_view.png + geometry.png HOMARD.png HOMARD_2.png hypotheses.png diff --git a/resources/HOMARDCatalog.xml.in b/resources/HOMARDCatalog.xml.in index ad8774cd..0435cbbe 100644 --- a/resources/HOMARDCatalog.xml.in +++ b/resources/HOMARDCatalog.xml.in @@ -1084,6 +1084,16 @@ + + UpdateStudy + HOMARD team - EDF RD + 1.1 + unknown + 0 + + + + PublishBoundaryUnderCase HOMARD team - EDF RD -- 2.39.2