Salome HOME
projects
/
modules
/
jobmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
You can now add options to the "driver" command of a YACS job.
[modules/jobmanager.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 8e39239e4bf3d2f05fcd7e6a994849d3b2b91222..40942eac461e89eae57ac508fee47b65892595ac 100755
(executable)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D
+# Copyright (C) 2012-201
5
CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-27,12
+27,12
@@
CMAKE_POLICY(SET CMP0003 NEW)
# Project name, upper case
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
# Project name, upper case
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION
7
)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION
5
)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION
1
)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION
8
)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION
0
)
+SET(${PROJECT_NAME_UC}_PATCH_VERSION
0
)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV
1
)
+SET(${PROJECT_NAME_UC}_VERSION_DEV
0
)
# Find KERNEL
# ===========
# Find KERNEL
# ===========
@@
-94,9
+94,12
@@
ELSE(EXISTS ${GUI_ROOT_DIR})
MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
ENDIF(EXISTS ${GUI_ROOT_DIR})
MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
ENDIF(EXISTS ${GUI_ROOT_DIR})
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-INCLUDE(${QT_USE_FILE})
+# Qt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+ FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
+ELSE()
+ FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
# Detection summary:
SALOME_PACKAGE_REPORT_AND_CHECK()
# Detection summary:
SALOME_PACKAGE_REPORT_AND_CHECK()