Add the -DWITHOUT_MPI=1 possibility

[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 9d991e3ee296b6788d4725fa9e1f1786114a4692..463147e656f9e5675d0d94fc13cf331d17e786b8 100644 (file)
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -757,8 +757,8 @@ class CMakeFile(object):
                 pass
             # --
             newlines.append("""
-            set(VERSION 5.1.5)
-            set(XVERSION 0x050105)
+            set(VERSION 6.3.0)
+            set(XVERSION 0x060300)
             """)
             pass
         # --
@@ -1598,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})
         ''')