]> SALOME platform Git repositories - tools/medcoupling.git/commitdiff
Salome HOME
Merge branch 'V9_9_BR'
authorvsr <vsr@opencascade.com>
Tue, 31 May 2022 08:05:48 +0000 (11:05 +0300)
committervsr <vsr@opencascade.com>
Tue, 31 May 2022 08:07:15 +0000 (11:07 +0300)
14 files changed:
1  2 
CMakeLists.txt
src/ICoCo/Swig/CMakeLists.txt
src/ICoCo/Swig/CTestTestfileInstall.cmake
src/MEDCoupling_Swig/CMakeLists.txt
src/MEDCoupling_Swig/CTestTestfileInstall.cmake
src/MEDLoader/Swig/CMakeLists.txt
src/MEDLoader/Swig/CTestTestfileInstall.cmake
src/MEDPartitioner_Swig/CMakeLists.txt
src/ParaMEDMEM_Swig/CMakeLists.txt
src/ParaMEDMEM_Swig/CTestTestfileInstall.cmake.in
src/PyWrapping/CMakeLists.txt
src/PyWrapping/CTestTestfileInstall.cmake
src/RENUMBER_Swig/CMakeLists.txt
src/RENUMBER_Swig/CTestTestfileInstall.cmake

diff --cc CMakeLists.txt
index cbd863df6f38b7142e87ce342d8bf8694f917df7,8064b103d79896f6555a6372067ec3b813898614..aae5bce0ce4e9b854136effa170f4244f1c1dfdc
@@@ -49,7 -49,7 +49,7 @@@ ENDIF(
  
  # Versioning
  # ===========
- SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
 -SALOME_SETUP_VERSION(9.9.0)
++SALOME_SETUP_VERSION(9.9.0 DEVELOPMENT)
  MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
  
  # Platform setup
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge