Copyright update: 2016

[modules/kernel.git] / salome_adm / cmake_files / FindOmniORBPy.cmake

diff --git a/salome_adm/cmake_files/FindOmniORBPy.cmake b/salome_adm/cmake_files/FindOmniORBPy.cmake
index fd6a2cca37cd0eb5dfd2317368cc2cfbc51d3223..b1c4e6dccdc8f6580a71397c4c16101726e152b5 100644 (file)
--- a/salome_adm/cmake_files/FindOmniORBPy.cmake
+++ b/salome_adm/cmake_files/FindOmniORBPy.cmake
@@ -9,12 +9,12 @@
 #
 
 ################################################################
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,33 +27,26 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-################################################################
 
 ##############################################################################
 # find python back-end
 ##############################################################################
 
 SET(_py_version "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-SET(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH})
-SET(_doc "Path to python-backend directory (omniidl_be) including python.py file")
-IF(WIN32)
-  FIND_PATH(OMNIORB_PYTHON_BACKEND
-     NAMES python.py PATHS "/lib/python/omniidl_be" DOC ${_doc}) 
-ELSE()
-  FIND_PATH(OMNIORB_PYTHON_BACKEND
-     NAMES python.py
-     PATHS "/lib/python${_py_version}/site-packages/omniidl_be" "/usr/lib/omniidl/omniidl_be" 
-     DOC ${_doc})
-ENDIF()
+FIND_PATH(OMNIORB_PYTHON_BACKEND
+  NAMES python.py
+  PATHS "${OMNIORBPY_ROOT_DIR}" "/usr" 
+  PATH_SUFFIXES "/lib/python${_py_version}/site-packages/omniidl_be" "/lib/omniidl/omniidl_be" "/lib/python/omniidl_be"
+  DOC "Path to python-backend directory (omniidl_be) including python.py file")
 
 ##############################################################################
 # Cook our stuff
 ##############################################################################
 MARK_AS_ADVANCED(OMNIORB_PYTHON_BACKEND)
   
-SET(OMNIORB_IDLPYFLAGS -bpython)
+SET(OMNIORB_IDLPYFLAGS)
 IF (OMNIORB_PYTHON_BACKEND) 
-  SET(OMNIORB_IDLPYFLAGS "-p ${OMNIORB_PYTHON_BACKEND} ${OMNIORB_IDLPYFLAGS}")
+  LIST(APPEND OMNIORB_IDLPYFLAGS -bpython -p${OMNIORB_PYTHON_BACKEND})
 ENDIF()
 SET(IDLPYFLAGS ${OMNIORB_IDLPYFLAGS})