From d2db0e687836e58625287575802110b0517248e0 Mon Sep 17 00:00:00 2001 From: ana Date: Thu, 27 Sep 2012 07:34:58 +0000 Subject: [PATCH] CMake compatibility: fix problen with LIBBATCH --- salome_adm/cmake_files/FindLIBBATCH.cmake | 3 ++- src/Launcher/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/salome_adm/cmake_files/FindLIBBATCH.cmake b/salome_adm/cmake_files/FindLIBBATCH.cmake index 6ebfb6891..aee305de4 100644 --- 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 a2e7ea0dc..b314fdcc1 100755 --- 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 -- 2.39.2