From cae31b5c23a3b936952eecf9b576569b65fe1b9b Mon Sep 17 00:00:00 2001 From: Yoann AUDOUIN Date: Fri, 12 May 2017 14:33:44 +0200 Subject: [PATCH] Further testing --- adm_local/cmake_files/FindSalomeTelemac.cmake | 6 ++---- adm_local/cmake_files/FindTelemac.cmake | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/adm_local/cmake_files/FindSalomeTelemac.cmake b/adm_local/cmake_files/FindSalomeTelemac.cmake index 809064e..c16a2cb 100644 --- a/adm_local/cmake_files/FindSalomeTelemac.cmake +++ b/adm_local/cmake_files/FindSalomeTelemac.cmake @@ -28,11 +28,9 @@ MARK_AS_ADVANCED(TELEMAC_LIBRARY_api TELEMAC_LIBRARY_special TELEMAC_LIBRARY_telemac2d TELEMAC_LIBRARY_tomawac - TELEMAC_LIBRARY_hermes - TELEMAC_LIBRARY_partel TELEMAC_LIBRARY_gretel - TELEMAC_INCLUDE_DIR - TELEMAC_API_SRC_DIR) + TELEMAC_LIBRARY_partel + TELEMAC_LIBRARY_hermes) IF(Telemac_FOUND OR TELEMAC_FOUND) SALOME_ACCUMULATE_HEADERS(TELEMAC_INCLUDE_DIR) diff --git a/adm_local/cmake_files/FindTelemac.cmake b/adm_local/cmake_files/FindTelemac.cmake index 91e62df..1d9d939 100644 --- a/adm_local/cmake_files/FindTelemac.cmake +++ b/adm_local/cmake_files/FindTelemac.cmake @@ -37,6 +37,8 @@ FIND_LIBRARY(TELEMAC_LIBRARY_partel partel PATHS ${TELEMAC_ROOT_DIR}/salome/wrap_api/lib) FIND_LIBRARY(TELEMAC_LIBRARY_hermes hermes PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib) +FIND_PATH(TELEMAC_INCLUDE_DIR interface_telemac2d.mod + PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/include) # Handle the standard arguments of the find_package() command: INCLUDE(FindPackageHandleStandardArgs) @@ -50,6 +52,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Telemac REQUIRED_VARS TELEMAC_LIBRARY_api TELEMAC_LIBRARY_tomawac TELEMAC_LIBRARY_gretel TELEMAC_LIBRARY_partel - TELEMAC_LIBRARY_hermes - TELEMAC_INCLUDE_DIR - TELEMAC_API_SRC_DIR) + TELEMAC_LIBRARY_hermes) -- 2.39.2