-# 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
#
INCLUDE_DIRECTORIES(
- ${LIBXML_INCLUDE_DIRS}
- ${OMNIORB_INCLUDE_DIRS}
+ ${LIBXML2_INCLUDE_DIR}
+ ${OMNIORB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIRS}
- ${MPI_INCLUDE_DIRS}
+ ${MPI_CXX_INCLUDE_PATH}
${LIBBATCH_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/salome_adm
${CMAKE_CURRENT_SOURCE_DIR}/../Basics
${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager
${CMAKE_BINARY_DIR}/idl
)
-SET(WITH_LIBBATCH_FLAG)
-IF(WITH_LIBBATCH)
- SET(WITH_LIBBATCH_FLAG "-DWITH_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} ${OMNIORB_DEFINITIONS} ${WITH_LIBBATCH_FLAG} ${PLATFORM_DEFINITIONS}")
+ADD_DEFINITIONS(${MPI_CXX_COMPILE_FLAGS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+IF(SALOME_USE_LIBBATCH AND LIBBATCH_FOUND)
+ ADD_DEFINITIONS(-DWITH_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
SALOMELocalTrace
SALOMEBasics
SalomeIDLKernel
- ${LIBBATCH_LIBS}
- ${MPI_LIBS}
- ${OMNIORB_LIBS}
- ${LIBXML_LIBS}
- ${PYTHON_LIBS}
+ ${LIBBATCH_LIBRARIES}
+ ${MPI_CXX_LIBRARIES}
+ ${OMNIORB_LIBRARIES}
+ ${LIBXML2_LIBRARIES}
+ ${PYTHON_LIBRARIES}
)
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
Launcher_Job_YACSFile.cxx
Launcher.cxx
)
-SET(Launcher_FLAGS "${MPI_DEFINITIONS} ${LIBXML_DEFINITIONS} ${LIBBATCH_DEFINITIONS} ${WITH_LIBBATCH_FLAG} ${PLATFORM_DEFINITIONS}")
-ADD_LIBRARY(Launcher SHARED ${Launcher_SOURCES})
-SET_TARGET_PROPERTIES(Launcher PROPERTIES COMPILE_FLAGS "${Launcher_FLAGS}")
-TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBS} ${MPI_LIBS} ${LIBXML_LIBS})
+ADD_LIBRARY(Launcher ${Launcher_SOURCES})
+TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBRARIES} ${MPI_CXX_LIBRARIES} ${LIBXML2_LIBS})
INSTALL(TARGETS Launcher DESTINATION ${KERNEL_salomelib_LIBS})
SET(TestLauncher_LIBS
- ${LIBXML_LIBS}
+ ${LIBXML2_LIBRARIES}
ResourcesManager
Launcher
OpUtil
- ${LIBBATCH_LIBS}
+ ${LIBBATCH_LIBRARIES}
)
ADD_EXECUTABLE(TestLauncher TestLauncher.cxx)
-SET_TARGET_PROPERTIES(TestLauncher PROPERTIES COMPILE_FLAGS "${LIBXML_DEFINITIONS} ${LIBBATCH_DEFINITIONS} ${WITH_LIBBATCH_FLAG} ${PLATFORM_DEFINITIONS}")
TARGET_LINK_LIBRARIES(TestLauncher ${TestLauncher_LIBS})
INSTALL(TARGETS TestLauncher DESTINATION ${KERNEL_salomebin_BINS})
IF(NOT WITHONLYLAUNCHER)
- ADD_LIBRARY(SalomeLauncher SHARED BatchTest.cxx SALOME_Launcher.cxx)
- SET_TARGET_PROPERTIES(SalomeLauncher PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+ ADD_LIBRARY(SalomeLauncher BatchTest.cxx SALOME_Launcher.cxx)
TARGET_LINK_LIBRARIES(SalomeLauncher Launcher ${COMMON_LIBS})
INSTALL(TARGETS SalomeLauncher DESTINATION ${KERNEL_salomelib_LIBS})
SalomeLauncher
SALOMEBasics
SALOMELocalTrace
- ${LIBBATCH_LIBS}
- ${MPI_LIBS}
- ${OMNIORB_LIBS}
- ${LIBXML_LIBS}
- ${PYTHON_LIBS}
+ ${LIBBATCH_LIBRARIES}
+ ${MPI_CXX_LIBRARIES}
+ ${OMNIORB_LIBRARIES}
+ ${LIBXML2_LIBRARIES}
+ ${PYTHON_LIBRARIES}
)
ADD_EXECUTABLE(SALOME_LauncherServer SALOME_LauncherServer.cxx)
- SET_TARGET_PROPERTIES(SALOME_LauncherServer PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
TARGET_LINK_LIBRARIES(SALOME_LauncherServer ${SALOME_LauncherServer_LIBS})
INSTALL(TARGETS SALOME_LauncherServer DESTINATION ${KERNEL_salomebin_BINS})
ENDIF(NOT WITHONLYLAUNCHER)