Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_4_BR'
[modules/smesh.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
old mode 100755
(executable)
new mode 100644
(file)
index
00c8635
..
10fb7d4
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
9
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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-33,11
+33,11
@@
ENDIF(WIN32)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION
2
)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION
1
)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION
4
)
+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
0
)
+SET(${PROJECT_NAME_UC}_VERSION_DEV
1
)
# Common CMake macros
# ===================
# Common CMake macros
# ===================
@@
-151,19
+151,11
@@
IF(SALOME_BUILD_GUI)
## Prerequisites From GUI:
##
# Qt
## Prerequisites From GUI:
##
# Qt
- IF(NOT SALOME_GUI_BUILD_WITH_QT5)
- FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
- ELSE()
- FIND_PACKAGE(SalomeQt5 REQUIRED)
- ENDIF()
+ FIND_PACKAGE(SalomeQt5 REQUIRED)
# SIP
FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt5
# PyQt
# SIP
FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt5
# PyQt
- IF (NOT SALOME_GUI_BUILD_WITH_QT5)
- FIND_PACKAGE(SalomePyQt4 REQUIRED)
- ELSE()
- FIND_PACKAGE(SalomePyQt5 REQUIRED)
- ENDIF()
+ FIND_PACKAGE(SalomePyQt5 REQUIRED)
# Qwt
FIND_PACKAGE(SalomeQwt REQUIRED)
ELSE(EXISTS ${GUI_ROOT_DIR})
# Qwt
FIND_PACKAGE(SalomeQwt REQUIRED)
ELSE(EXISTS ${GUI_ROOT_DIR})