CMake compatibility: fix problen with LIBBATCH

diff --git a/salome_adm/cmake_files/FindLIBBATCH.cmake b/salome_adm/cmake_files/FindLIBBATCH.cmake
index 6ebfb6891105457286df507ea61b407cf00a3006..aee305de420302f686d7cbbfa1389b0bc32ad1df 100644 (file)
--- a/salome_adm/cmake_files/FindLIBBATCH.cmake
+++ b/salome_adm/cmake_files/FindLIBBATCH.cmake
@@ -79,7 +79,8 @@ IF(LIBBATCH_STATUS)
   FIND_PATH(LIBBATCH_INCLUDE_DIR ${LIBBATCH_INCLUDE_TO_FIND} PATHS ${LIBBATCH_INCLUDE_PATHS} ${LIBBATCH_FIND_PATHS_OPTION})
   IF(LIBBATCH_INCLUDE_DIR)
     IF(LIBBATCH_ROOT_USER)
-      SET(LIBBATCH_INCLUDES -I${LIBBATCH_INCLUDE_DIR})
+      SET(LIBBATCH_INCLUDES -I${LIBBATCH_INCLUDE_DIR}) # to be removed
+      SET(LIBBATCH_INCLUDE_DIRS ${LIBBATCH_INCLUDE_DIR})       
     ENDIF(LIBBATCH_ROOT_USER)
     MESSAGE(STATUS "${LIBBATCH_INCLUDE_TO_FIND} found in ${LIBBATCH_INCLUDE_DIR}")
   ELSE(LIBBATCH_INCLUDE_DIR)

diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt
index a2e7ea0dc2657e028d0a2c371b4c23c7ba11b8d5..b314fdcc1cc5e00482ae8e329087796db5aa0c0d 100755 (executable)
--- a/src/Launcher/CMakeLists.txt
+++ b/src/Launcher/CMakeLists.txt
@@ -41,7 +41,7 @@ IF(WITH_LIBBATCH)
 ENDIF(WITH_LIBBATCH)
 
 # This local variable defines the list of FLAGS common to all target in this package.
-SET(COMMON_FLAGS "${MPI_DEFINITIONS} ${LIBXML_DEFINITIONS} ${LIBBATCH_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${WITH_LIBBATCH_FLAG} ${PLATFORM_DEFINITIONS}")
+SET(COMMON_FLAGS "${MPI_DEFINITIONS} ${LIBXML_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${WITH_LIBBATCH_FLAG} ${PLATFORM_DEFINITIONS}")
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 SET(COMMON_LIBS