X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=f2b3237bef5b3a82323493a363d6b454631e7d5a;hb=b91bc9cfc95f981e5e8d322ffd458ac993c5b403;hp=e8f01b0663f671ba876316e2afc50cce35254471;hpb=ee9174905906835c2e274aa00fed2286e620522a;p=samples%2Fpycalculator.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8f01b0..f2b3237 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
@@ -27,13 +27,23 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+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)
 
+# Common CMake macros
+# ===================
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
+
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
@@ -70,24 +80,25 @@ ENDIF()
 ##
 ## From KERNEL:
 ##
-FIND_PACKAGE(SalomePython REQUIRED)
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
   
-# Find MED
+# Find FIELDS
 # ===========
 
-SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "Path to the Salome MED")
-IF(EXISTS ${MED_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
-  FIND_PACKAGE(SalomeMED REQUIRED)
-  IF(SALOME_MED_STANDALONE)
-    MESSAGE(FATAL_ERROR "We absolutely need a Salome MED with KERNEL, 
-                         please set SALOME_MED_STANDALONE=OFF when building MED module.")
+SET(FIELDS_ROOT_DIR $ENV{FIELDS_ROOT_DIR} CACHE PATH "Path to the Salome FIELDS")
+IF(EXISTS ${FIELDS_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${FIELDS_ROOT_DIR}/adm_local/cmake_files")
+  FIND_PACKAGE(SalomeFIELDS REQUIRED)
+  IF(SALOME_FIELDS_STANDALONE)
+    MESSAGE(FATAL_ERROR "We absolutely need a Salome FIELDS with KERNEL, 
+                         please set SALOME_FIELDS_STANDALONE=OFF when building FIELDS module.")
   ENDIF()
-ELSE(EXISTS ${MED_ROOT_DIR})
-  MESSAGE(FATAL_ERROR "We absolutely need a Salome MED, please define MED_ROOT_DIR")
-ENDIF(EXISTS ${MED_ROOT_DIR})
+ELSE(EXISTS ${FIELDS_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need a Salome FIELDS, please define FIELDS_ROOT_DIR")
+ENDIF(EXISTS ${FIELDS_ROOT_DIR})
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
@@ -166,7 +177,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #   - in the build tree:
 
 # Ensure the variables are always defined for the configure:
-SET(MED_ROOT_DIR "${MED_ROOT_DIR}")
+SET(FIELDS_ROOT_DIR "${FIELDS_ROOT_DIR}")
  
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
 
@@ -177,7 +188,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-    MED_ROOT_DIR)
+    FIELDS_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}