From da98c1b0fead74626daf7b484df8de02e640e4f7 Mon Sep 17 00:00:00 2001 From: "Maintenance team (INV)" Date: Wed, 25 Mar 2015 21:34:34 +0300 Subject: [PATCH] Synchronize adm files --- .../cmake_files/FindSalomePython.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/adm_local_without_kernel/cmake_files/FindSalomePython.cmake b/adm_local_without_kernel/cmake_files/FindSalomePython.cmake index b4fad7637..6d4cc2950 100644 --- a/adm_local_without_kernel/cmake_files/FindSalomePython.cmake +++ b/adm_local_without_kernel/cmake_files/FindSalomePython.cmake @@ -107,6 +107,14 @@ ENDIF() # Set the FOUND flag for SalomePython and Python: SET(SALOMEPYTHON_FOUND FALSE) IF (_found1 AND PYTHONLIBS_FOUND) + + # 24.03.2015 ANA: Fix problem on Windows in Debug mode + # If you have Python, installed by Windows MSI Installer, + # PYTHON_LIBRARIES variable contains redundant release libraries... + IF(WIN32 AND CMAKE_BUILD_TYPE STREQUAL Debug) + SET (PYTHON_LIBRARIES ${PYTHON_DEBUG_LIBRARIES}) + ENDIF() + SET(SALOMEPYTHON_FOUND TRUE) SET(Python_FOUND TRUE) ELSE() @@ -116,7 +124,7 @@ ENDIF() IF (SALOMEPYTHON_FOUND) MESSAGE(STATUS "Python interpreter and Python libraries found:") - MESSAGE(STATUS "Python libraries: ${PYTHON_LIBRARY}") + MESSAGE(STATUS "Python libraries: ${PYTHON_LIBRARIES}") MESSAGE(STATUS "Python include dir: ${PYTHON_INCLUDE_DIR}") # 3. Set the root dir which was finally retained -- 2.39.2