X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=452dbe5b89e3b4863a003933d9ba6c9a83f69e86;hb=1420d125fc0f5a221732538d1bee83e7ee1bcd66;hp=93b73452e6c4fb508329f71c6de8283ba1aef0f7;hpb=c89fe0ccd4b16d0748945e41c176189c6e8de3d1;p=modules%2Fmed.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 93b73452e..452dbe5b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D +# Copyright (C) 2012-2013 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 @@ -24,7 +24,7 @@ IF(COMMAND cmake_policy) ENDIF(COMMAND cmake_policy) ENABLE_TESTING() -SET(VERSION "7.0.0") +SET(VERSION "7.1.0") SET(VERSION_DEV "1") SET(WITH_MEDMEMGUI "0") @@ -36,9 +36,11 @@ IF(KERNEL_ROOT_DIR) FILE(TO_CMAKE_PATH $ENV{KERNEL_ROOT_DIR} KERNEL_ROOT_DIR) SET(MED_ENABLE_KERNEL ON) + # directories for packages detection SET(SALOME_MACROS_DIR ${KERNEL_ROOT_DIR}/salome_adm/cmake_files) - - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindPLATFORM.cmake) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SALOME_MACROS_DIR}) + + find_package(PLATFORM) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindPYTHON.cmake) if(SALOME_USE_MPI) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindMPI.cmake)