From: Maintenance team (INV) Date: Wed, 25 Mar 2015 18:34:45 +0000 (+0300) Subject: Synchronize adm files X-Git-Tag: V7_6_0b1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=493ce269b09b5344f7d5c120f8378cc855262e09;p=tools%2Fdocumentation.git Synchronize adm files --- diff --git a/CMakeModules/FindSalomePython.cmake b/CMakeModules/FindSalomePython.cmake index b4fad76..6d4cc29 100644 --- a/CMakeModules/FindSalomePython.cmake +++ b/CMakeModules/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