Fix regression in Launcher with ForEach-like batch jobs

[modules/yacs.git] / src / Launcher / CMakeLists.txt

diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt
index f8ee6e1b857317793a57280c6ec3600db1fb37bc..5d74e2dc30d42527e73a64b01b55631c700487be 100755 (executable)
--- a/src/Launcher/CMakeLists.txt
+++ b/src/Launcher/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -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
@@ -37,9 +37,9 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_DEFINITIONS(${MPI_CXX_COMPILE_FLAGS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS})
-IF(SALOME_USE_LIBBATCH)
+IF(SALOME_USE_LIBBATCH AND LIBBATCH_FOUND)
   ADD_DEFINITIONS(-DWITH_LIBBATCH)
-ENDIF(SALOME_USE_LIBBATCH)
+ENDIF(SALOME_USE_LIBBATCH AND LIBBATCH_FOUND)
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 SET(COMMON_LIBS
@@ -52,7 +52,7 @@ SET(COMMON_LIBS
   SALOMELocalTrace
   SALOMEBasics
   SalomeIDLKernel
-  ${LIBBATCH_LIBS}
+  ${LIBBATCH_LIBRARIES}
   ${MPI_CXX_LIBRARIES}
   ${OMNIORB_LIBRARIES}
   ${LIBXML2_LIBRARIES}
@@ -62,7 +62,6 @@ SET(COMMON_LIBS
 SET(Launcher_SOURCES
   SALOME_Launcher_Parser.cxx
   SALOME_Launcher_Handler.cxx
-  Launcher_Utils.hxx
   Launcher_Job.cxx
   Launcher_Job_Command.cxx
   Launcher_Job_SALOME.cxx
@@ -72,7 +71,7 @@ SET(Launcher_SOURCES
 )
 
 ADD_LIBRARY(Launcher ${Launcher_SOURCES})
-TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBS} ${MPI_CXX_LIBRARIES} ${LIBXML2_LIBS})
+TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBRARIES} ${MPI_CXX_LIBRARIES} ${LIBXML2_LIBS})
 INSTALL(TARGETS Launcher DESTINATION ${KERNEL_salomelib_LIBS})
 
 SET(TestLauncher_LIBS
@@ -80,7 +79,7 @@ SET(TestLauncher_LIBS
   ResourcesManager
   Launcher
   OpUtil
-  ${LIBBATCH_LIBS}
+  ${LIBBATCH_LIBRARIES}
 )
 
 ADD_EXECUTABLE(TestLauncher TestLauncher.cxx)
@@ -97,7 +96,7 @@ IF(NOT WITHONLYLAUNCHER)
     SalomeLauncher
     SALOMEBasics
     SALOMELocalTrace
-    ${LIBBATCH_LIBS}
+    ${LIBBATCH_LIBRARIES}
     ${MPI_CXX_LIBRARIES}
     ${OMNIORB_LIBRARIES}
     ${LIBXML2_LIBRARIES}