Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fa49d0c
f1ee2be
)
Merge branch 'V9_2_2_BR'
author
vsr
<vsr@opencascade.com>
Tue, 5 Mar 2019 07:22:59 +0000
(10:22 +0300)
committer
vsr
<vsr@opencascade.com>
Tue, 5 Mar 2019 07:22:59 +0000
(10:22 +0300)
1
2
CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CMakeLists.txt
index 76e2c67d87cacd7627894a0b629c840c1f3e113b,f51c52f5befd4c6ba3676b17850343fe3bccc11b..13f7a4532f87173ff5a1d590687a8f5a5270f332
mode 100644,100755..100644
---
1
/
CMakeLists.txt
---
2
/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@@
-34,10
-34,10
+34,10
@@@
STRING(TOUPPER ${PROJECT_NAME} PROJECT_
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION
0
)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION
2
)
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
# ===================