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 229d54d..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
@@ -35,11 +35,11 @@ IF(SalomeOmniORB_FOUND)
     ENDIF()
   ENDIF()
 
-  IF(WINDOWS)
+  IF(WIN32)
     SET(DIR_COUNT 3) 
-  ELSE(WINDOWS)
+  ELSE(WIN32)
     SET(DIR_COUNT 4) 
-  ENDIF(WINDOWS)
+  ENDIF(WIN32)
 
   SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OmniORBPy OMNIORB_PYTHON_BACKEND ${DIR_COUNT})
   #MARK_AS_ADVANCED()
@@ -48,3 +48,9 @@ ELSE()
     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()