X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=3a0327fd3c4d660ad63c9b3fddaa9613be5a76a9;hb=3857007e3b712cc2bf885df5a3af5405c552985a;hp=a613e771cbf14d75804c0dcdb4ebc9f8a6c4e093;hpb=468bbce4875c5e421f0a9e4f5f37aaf4fc2a4247;p=modules%2Fmed.git diff --git a/CMakeLists.txt b/CMakeLists.txt index a613e771c..3a0327fd3 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,8 +24,8 @@ IF(COMMAND cmake_policy) ENDIF(COMMAND cmake_policy) ENABLE_TESTING() -SET(VERSION "7.0.0") -SET(VERSION_DEV "1") +SET(VERSION "7.2.0") +SET(VERSION_DEV "0") SET(WITH_MEDMEMGUI "0") #Defining all options first @@ -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) @@ -62,7 +64,7 @@ IF(KERNEL_ROOT_DIR) INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindCAS.cmake) INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindQT4.cmake) INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindOPENGL.cmake) - INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindVTK.cmake) + #INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindSalomeVTK.cmake) INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindQWT.cmake) INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindSIPPYQT.cmake) INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindGUI.cmake)