Small fix for check_openmpi.m4

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

diff --git a/salome_adm/cmake_files/FindPYTHON.cmake b/salome_adm/cmake_files/FindPYTHON.cmake
index 9d9934c335b8f8b51ed2aa1f0ba59c27e6100b91..9c4bfeb4eca826361be4f5b237a5d6b990000571 100644 (file)
--- a/salome_adm/cmake_files/FindPYTHON.cmake
+++ b/salome_adm/cmake_files/FindPYTHON.cmake
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # ------
 
 MESSAGE(STATUS "Check for python ...")
@@ -86,7 +87,7 @@ IF(PYTHON_STATUS)
     SET(PYTHON_EXECUTABLE_PATHS)
   ELSE(NOT PYTHON_ROOT_USER)
     IF(WINDOWS)
-      SET(PYTHON_EXECUTABLE_PATHS ${PYTHON_ROOT_USER} ${PYTHON_ROOT_USER}/bin ${PYTHON_ROOT_USER}/PCbuild)
+      SET(PYTHON_EXECUTABLE_PATHS ${PYTHON_ROOT_USER})
     ELSE(WINDOWS)
       SET(PYTHON_EXECUTABLE_PATHS ${PYTHON_ROOT_USER}/bin)
     ENDIF(WINDOWS)
@@ -97,12 +98,10 @@ IF(PYTHON_STATUS)
     IF(PYTHON_EXECUTABLE STREQUAL /usr/bin/python)
     ELSE(PYTHON_EXECUTABLE STREQUAL /usr/bin/python)
       SET(PYTHON_ROOT_USER ${PYTHON_EXECUTABLE})
-      IF(PYTHON_EXECUTABLE STREQUAL ${PYTHON_ROOT_USER}/${PYTHON_EXECUTABLE_TO_FIND})
-       GET_FILENAME_COMPONENT(PYTHON_ROOT_USER ${PYTHON_ROOT_USER} PATH)
-      ELSE(PYTHON_EXECUTABLE STREQUAL ${PYTHON_ROOT_USER}/${PYTHON_EXECUTABLE_TO_FIND})
-       GET_FILENAME_COMPONENT(PYTHON_ROOT_USER ${PYTHON_ROOT_USER} PATH)
+      GET_FILENAME_COMPONENT(PYTHON_ROOT_USER ${PYTHON_ROOT_USER} PATH)
+      IF(NOT WINDOWS)
        GET_FILENAME_COMPONENT(PYTHON_ROOT_USER ${PYTHON_ROOT_USER} PATH)
-      ENDIF(PYTHON_EXECUTABLE STREQUAL ${PYTHON_ROOT_USER}/${PYTHON_EXECUTABLE_TO_FIND})
+      ENDIF(NOT WINDOWS)
     ENDIF(PYTHON_EXECUTABLE STREQUAL /usr/bin/python)
   ELSE(PYTHON_EXECUTABLE)
     IF(PYTHON_ROOT_USER)
@@ -201,6 +200,7 @@ ENDIF(PYTHON_STATUS)
 # ----
 
 IF(PYTHON_STATUS)
+  SET(PYTHON_CPPFLAGS ${PYTHON_INCLUDES})
 ELSE(PYTHON_STATUS)
   IF(PYTHON_IS_MANDATORY)
     MESSAGE(FATAL_ERROR "python not found ... mandatory ... abort")