[PY3] Fix m4 macro for python 3

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

diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt
index 775cc8ccb37c395a69280c97b87ab94df57b858d..e85ee37b1628edb26b8ac9ae71b8f02a2a921d83 100755 (executable)
--- a/src/Launcher/CMakeLists.txt
+++ b/src/Launcher/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
@@ -17,12 +17,15 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+IF(SALOME_BUILD_TESTS)
+  ADD_SUBDIRECTORY(Test)
+ENDIF(SALOME_BUILD_TESTS)
+
 INCLUDE_DIRECTORIES(
   ${LIBXML2_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${MPI_CXX_INCLUDE_PATH}
   ${LIBBATCH_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
@@ -37,7 +40,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_BINARY_DIR}/idl
 )
 
-ADD_DEFINITIONS(${MPI_CXX_COMPILE_FLAGS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 IF(SALOME_USE_LIBBATCH)
   ADD_DEFINITIONS(-DWITH_LIBBATCH)
 ENDIF(SALOME_USE_LIBBATCH)
@@ -54,7 +57,6 @@ SET(COMMON_LIBS
   SALOMEBasics
   SalomeIDLKernel
   ${LIBBATCH_LIBRARIES}
-  ${MPI_CXX_LIBRARIES}
   ${OMNIORB_LIBRARIES}
   ${LIBXML2_LIBRARIES}
   ${PYTHON_LIBRARIES}
@@ -73,43 +75,40 @@ SET(Launcher_SOURCES
 )
 
 ADD_LIBRARY(Launcher ${Launcher_SOURCES})
-TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBRARIES} ${MPI_CXX_LIBRARIES} ${LIBXML2_LIBS})
+TARGET_LINK_LIBRARIES(Launcher ResourcesManager ${LIBBATCH_LIBRARIES} ${LIBXML2_LIBS})
 INSTALL(TARGETS Launcher EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 SET(TestLauncher_LIBS
   ${LIBXML2_LIBRARIES}
   ResourcesManager
   Launcher
-  OpUtil
   ${LIBBATCH_LIBRARIES}
 )
 
+# TestLauncher needs only (and must need only) libxml, libbatch, ResourceManager and Launcher libraries!
 ADD_EXECUTABLE(TestLauncher TestLauncher.cxx)
 TARGET_LINK_LIBRARIES(TestLauncher ${TestLauncher_LIBS})
 INSTALL(TARGETS TestLauncher DESTINATION ${SALOME_INSTALL_BINS})
 
-IF(NOT SALOME_LAUNCHER_ONLY)
-  ADD_LIBRARY(SalomeLauncher BatchTest.cxx SALOME_Launcher.cxx)
-  TARGET_LINK_LIBRARIES(SalomeLauncher Launcher ${COMMON_LIBS})
-  INSTALL(TARGETS SalomeLauncher EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+ADD_LIBRARY(SalomeLauncher BatchTest.cxx SALOME_Launcher.cxx)
+TARGET_LINK_LIBRARIES(SalomeLauncher Launcher ${COMMON_LIBS})
+INSTALL(TARGETS SalomeLauncher EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  SET(SALOME_LauncherServer_LIBS
-    Launcher
-    SalomeLauncher
-    SalomeSDS
-    SALOMEBasics
-    SALOMELocalTrace
-    ${LIBBATCH_LIBRARIES}
-    ${MPI_CXX_LIBRARIES}
-    ${OMNIORB_LIBRARIES}
-    ${LIBXML2_LIBRARIES}
-    ${PYTHON_LIBRARIES}
-  )
+SET(SALOME_LauncherServer_LIBS
+  Launcher
+  SalomeLauncher
+  SalomeSDS
+  SALOMEBasics
+  SALOMELocalTrace
+  ${LIBBATCH_LIBRARIES}
+  ${OMNIORB_LIBRARIES}
+  ${LIBXML2_LIBRARIES}
+  ${PYTHON_LIBRARIES}
+)
 
-  ADD_EXECUTABLE(SALOME_LauncherServer SALOME_LauncherServer.cxx)
-  TARGET_LINK_LIBRARIES(SALOME_LauncherServer ${SALOME_LauncherServer_LIBS})
-  INSTALL(TARGETS SALOME_LauncherServer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
-ENDIF()
+ADD_EXECUTABLE(SALOME_LauncherServer SALOME_LauncherServer.cxx)
+TARGET_LINK_LIBRARIES(SALOME_LauncherServer ${SALOME_LauncherServer_LIBS})
+INSTALL(TARGETS SALOME_LauncherServer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
 
 SET(COMMON_HEADERS_HXX
   BatchTest.hxx
@@ -125,3 +124,4 @@ SET(COMMON_HEADERS_HXX
   SALOME_Launcher_defs.hxx
 )
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+INSTALL(FILES testLauncher.xml DESTINATION ${SALOME_KERNEL_INSTALL_RES_DATA})