Synchronize adm files

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

diff --git a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
old mode 100644 (file)
new mode 100755 (executable)
index 9a6006a..d7d8a4d
--- a/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
+++ b/salome_adm/cmake_files/FindSalomeOmniORBPy.cmake
@@ -1,9 +1,9 @@
-# Copyright (C) 2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
@@ -26,16 +26,31 @@
 
 IF(SalomeOmniORB_FOUND)
   # If no OMNIORBPY_ROOT_DIR is given, then try with OMNIORB_ROOT_DIR:
-  SET(OMNIORBPY_ROOT_DIR "$ENV{OMNIORBPY_ROOT_DIR}" CACHE PATH "Path to the OmniORB Python backend")
-  IF(EXISTS "${OMNIORB_ROOT_DIR}" AND (NOT OMNIORBPY_ROOT_DIR))
-    MESSAGE(STATUS "Looking for OmniORB Python backend in the OmniORB installation (OMNIORB_ROOT_DIR exists and OMNIORBPY_ROOT_DIR_ROOT_DIR is not defined) ...")  
-    SET(OMNIORBPY_ROOT_DIR "${OMNIORB_ROOT_DIR}") 
+
+  IF(NOT OMNIORBPY_ROOT_DIR_EXP)
+    SET(OMNIORBPY_ROOT_DIR "$ENV{OMNIORBPY_ROOT_DIR}" CACHE PATH "Path to the OmniORB Python backend")
+    IF(EXISTS "${OMNIORB_ROOT_DIR}" AND (NOT OMNIORBPY_ROOT_DIR))
+      MESSAGE(STATUS "Looking for OmniORB Python backend in the OmniORB installation (OMNIORB_ROOT_DIR exists and OMNIORBPY_ROOT_DIR is not defined) ...")  
+      SET(OMNIORBPY_ROOT_DIR "${OMNIORB_ROOT_DIR}") 
+    ENDIF()
   ENDIF()
 
-  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OmniORBPy OMNIORB_PYTHON_BACKEND 4)
+  IF(WIN32)
+    SET(DIR_COUNT 3) 
+  ELSE(WIN32)
+    SET(DIR_COUNT 4) 
+  ENDIF(WIN32)
+
+  SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OmniORBPy OMNIORB_PYTHON_BACKEND ${DIR_COUNT})
   #MARK_AS_ADVANCED()
 ELSE()
   IF(NOT SalomeOmniORBPy_FIND_QUIETLY)
     MESSAGE(STATUS "OmniORB Python backend needs OmniORB, and OmniORB was not found!")
   ENDIF()
 ENDIF()
+
+IF(OMNIORBPY_FOUND)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OMNIORBPY_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${OMNIORBPY_LIBRARIES}
+                                           ${OMNIORBPY_PYTHONPATH})
+ENDIF()