From f11b1fda15fa339485b5fbee14637c1dc73c99ea Mon Sep 17 00:00:00 2001 From: Richard Christie Date: Fri, 1 Apr 2016 14:53:24 +1300 Subject: [PATCH] Fix re-running FindPythonLibs for multi-config --- Modules/FindPythonLibs.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index ab92f86..aafb6ff 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -127,6 +127,16 @@ unset(_PYTHON1_VERSIONS) unset(_PYTHON2_VERSIONS) unset(_PYTHON3_VERSIONS) +# in case re-run for multi-configuration build, extract optimized library from +# PYTHON_LIBRARY variable list "optimized;PYTHON_LIBRARY_RELEASE;debug;PYTHON_LIBRARY_DEBUG" +list(FIND PYTHON_LIBRARY "optimized" _Python_multiconfig_optimized_index) +list(LENGTH PYTHON_LIBRARY _Python_multiconfig_length) +if ((_Python_multiconfig_optimized_index EQUAL 0) AND (_Python_multiconfig_length GREATER 1)) + list(GET PYTHON_LIBRARY 1 PYTHON_LIBRARY) +endif() +unset(_Python_multiconfig_optimized_index) +unset(_Python_multiconfig_length) + foreach(_CURRENT_VERSION ${_Python_VERSIONS}) string(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) if(WIN32) -- 2.8.0.windows.1