Fix compilation for JOBMANAGER

[modules/kernel.git] / salome_adm / cmake_files / am2cmake.py

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 9fb8632dce4f7ee7e0734eedec71ecfd0864de44..bd89fb9d0d022e6c3bf66c0a6a7c718f088b5dab 100644 (file)
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -479,6 +479,7 @@ class CMakeFile(object):
                 INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
                 INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
                 INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindMPI.cmake)
+                INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/FindLIBBATCH.cmake)
                 """)
                 pass
             else:
@@ -497,6 +498,7 @@ class CMakeFile(object):
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindMPI.cmake)
+                    INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindLIBBATCH.cmake)
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindKERNEL.cmake)
                     ELSE(KERNEL_ROOT_DIR)
                     INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindPLATFORM.cmake)
@@ -517,6 +519,7 @@ class CMakeFile(object):
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindDOXYGEN.cmake)
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindMPI.cmake)
+                    INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindLIBBATCH.cmake)
                     INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindKERNEL.cmake)
                     """)
                     pass
@@ -656,6 +659,13 @@ class CMakeFile(object):
                 SET(ENABLE_QXGRAPHVIEWER ON)
                 """)
                 pass
+            elif self.module == "jobmanager":
+                newlines.append("""
+                IF(GUI_ROOT_DIR)
+                SET(HAS_GUI ON)
+                ENDIF(GUI_ROOT_DIR)
+                """)
+                pass
             elif self.module == "geom":
                 newlines.append("""
                 IF(GUI_ROOT_DIR)
@@ -1356,7 +1366,7 @@ class CMakeFile(object):
             newlines.append('''
             FOREACH(output ${MOC_FILES})
             ''')
-            if self.module == "yacs":
+            if self.module in ["jobmanager", "yacs"]:
                 newlines.append('''
                 STRING(REGEX REPLACE _moc.cxx .hxx input ${output})
                 ''')
@@ -1505,6 +1515,9 @@ class CMakeFile(object):
             "salomepypkg_PYTHON"               :  "${salomepypkgdir}",
             "mypkgpython_PYTHON"               :  "${mypkgpythondir}",
             }
+        if self.module == "jobmanager":
+            d["bin_SCRIPTS"] = "bin"
+            pass
         if self.module == "medfile":
             d = {
                 "include_HEADERS"        :  "include",
@@ -1585,7 +1598,13 @@ class CMakeFile(object):
         SET(lib)
         ENDIF(lib STREQUAL v)
         ENDFOREACH(v ${vars})
+        SET(test OFF)
+        IF(lib)
+        STRING(REGEX MATCH "^-lQt" test ${lib})
+        ENDIF(lib)
+        IF(NOT test)
         SET(libadd ${libadd} ${lib})
+        ENDIF(NOT test)
         ENDFOREACH(lib ${libs})
         TARGET_LINK_LIBRARIES(${name} ${libadd})
         ''')
@@ -2008,7 +2027,7 @@ class CMakeFile(object):
         # --
         self.setLibAdd(key, newlines)
         # --
-        if self.module in ["medfile", "netgen"]:
+        if self.module in ["jobmanager", "medfile", "netgen"]:
             newlines.append(r'''
             SET(DEST bin)
             ''')