From 525c3316f6a6e56f18c218bb63bd57ad413b6571 Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 30 Mar 2012 08:36:47 +0000 Subject: [PATCH] MED CMakization. --- salome_adm/cmake_files/FindPYTHON.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/salome_adm/cmake_files/FindPYTHON.cmake b/salome_adm/cmake_files/FindPYTHON.cmake index 62ec36672..5f045ff0a 100644 --- a/salome_adm/cmake_files/FindPYTHON.cmake +++ b/salome_adm/cmake_files/FindPYTHON.cmake @@ -142,12 +142,15 @@ IF(PYTHON_STATUS) ENDIF(PYTHON_ROOT_USER) SET(PYTHON_INCLUDE_TO_FIND Python.h) FIND_PATH(PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_TO_FIND} PATHS ${PYTHON_INCLUDE_PATHS} ${PYTHON_FIND_PATHS_OPTION}) + SET(PYTHON_FLAGS) IF(PYTHON_INCLUDE_DIR) - SET(PYTHON_INCLUDES -I${PYTHON_INCLUDE_DIR}) + SET(PYTHON_INCLUDES -I${PYTHON_INCLUDE_DIR})# to remove + SET(PYTHON_INCLUDES_DIR ${PYTHON_INCLUDE_DIR}) IF(WINDOWS) IF(CMAKE_BUILD_TYPE STREQUAL Release) ELSE(CMAKE_BUILD_TYPE STREQUAL Release) - SET(PYTHON_INCLUDES ${PYTHON_INCLUDES} -DHAVE_DEBUG_PYTHON) + SET(PYTHON_INCLUDES ${PYTHON_INCLUDES} -DHAVE_DEBUG_PYTHON)# to remove + SET(PYTHON_FLAGS "-DHAVE_DEBUG_PYTHON") ENDIF(CMAKE_BUILD_TYPE STREQUAL Release) ENDIF(WINDOWS) MESSAGE(STATUS "${PYTHON_INCLUDE_TO_FIND} found in ${PYTHON_INCLUDE_DIR}") @@ -210,7 +213,9 @@ IF(PYTHON_STATUS) SET(NUMPY_STATUS 1) ENDIF(NUMPY_INCLUDE_DIR) IF(NUMPY_STATUS) - SET(PYTHON_INCLUDES ${PYTHON_INCLUDES} -DWITH_NUMPY -I${NUMPY_INCLUDE_DIR}) + SET(PYTHON_INCLUDES ${PYTHON_INCLUDES} -DWITH_NUMPY -I${NUMPY_INCLUDE_DIR})# to remove + SET(PYTHON_INCLUDES_DIR ${PYTHON_INCLUDES_DIR} ${NUMPY_INCLUDE_DIR}) + SET(PYTHON_FLAGS "${PYTHON_FLAGS} -DWITH_NUMPY") MESSAGE(STATUS "numpy found : ${NUMPY_INCLUDE_DIR}") ELSE(NUMPY_STATUS) MESSAGE(STATUS "numpy not found") @@ -220,7 +225,7 @@ ENDIF(PYTHON_STATUS) # ---- IF(PYTHON_STATUS) - SET(PYTHON_CPPFLAGS ${PYTHON_INCLUDES}) + SET(PYTHON_CPPFLAGS ${PYTHON_INCLUDES})# to remove SET(PYLOGLEVEL WARNING) ELSE(PYTHON_STATUS) IF(PYTHON_IS_MANDATORY) -- 2.39.2