Adapt CMake procedure to libbatch 2.0

diff --git a/salome_adm/cmake_files/FindSalomeLIBBATCH.cmake b/salome_adm/cmake_files/FindSalomeLIBBATCH.cmake
index d84f2ca9fa3fe8f58d96522abaab44636123179d..b8ca0c071765bb9d7411b066ea75c8e6720e1a9b 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeLIBBATCH.cmake
+++ b/salome_adm/cmake_files/FindSalomeLIBBATCH.cmake
@@ -5,14 +5,9 @@ include(FindPackageHandleStandardArgs)
 
 set(LIBBATCH_ROOT_DIR $ENV{LIBBATCH_ROOT_DIR} CACHE PATH "Path to libbatch directory")
 if(EXISTS ${LIBBATCH_ROOT_DIR})
-  find_package(libBatch QUIET CONFIG PATHS ${LIBBATCH_ROOT_DIR}/lib NO_DEFAULT_PATH)
+  find_package(libbatch QUIET CONFIG PATHS ${LIBBATCH_ROOT_DIR}/lib NO_DEFAULT_PATH)
 endif(EXISTS ${LIBBATCH_ROOT_DIR})
-find_package(libBatch QUIET CONFIG)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(libBatch DEFAULT_MSG
+find_package(libbatch QUIET CONFIG)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(libbatch DEFAULT_MSG
   LIBBATCH_ROOT_DIR LIBBATCH_INCLUDE_DIRS LIBBATCH_LIBRARIES
   LIBBATCH_RUNTIME_LIBRARY_DIRS LIBBATCH_PYTHONPATH)
-
-# Artefact for compatibility with Libbatch 1.6.0, to be removed in Salome 7
-IF(LIBBATCH_FOUND)
-  get_filename_component(LIBBATCH_INCLUDE_DIR "${LIBBATCH_INCLUDE_DIRS}/.." ABSOLUTE)
-ENDIF(LIBBATCH_FOUND)

diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt
index 47bdcf83f8cfbe7de9631de4871594c247d2f8f7..af3fd7e5b52cf6e1ce27a2c25c7a6178db1edb4c 100755 (executable)
--- a/src/Launcher/CMakeLists.txt
+++ b/src/Launcher/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${MPI_CXX_INCLUDE_PATH}
-  ${LIBBATCH_INCLUDE_DIR}
+  ${LIBBATCH_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace