[Cmake-commits] [cmake-commits] marcus.hanwell committed FindPythonLibs.cmake 1.45 1.46

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv3471/Modules

Modified Files:
	FindPythonLibs.cmake 
Log Message:
Added a second call to find_library to find the static library.

When there is no shared object to link to a second call to find library is
necessary to find the static Python library. Fixes an issue raised on the CMake
mailing list, and it should be included in the next CMake patch release.


Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.45
retrieving revision 1.46
diff -C 2 -d -r1.45 -r1.46
*** FindPythonLibs.cmake	19 Oct 2009 14:39:29 -0000	1.45
--- FindPythonLibs.cmake	14 Dec 2009 19:15:31 -0000	1.46
***************
*** 45,48 ****
--- 45,56 ----
      NO_SYSTEM_ENVIRONMENT_PATH
    )
+   # Look for the static library in the Python config directory
+   FIND_LIBRARY(PYTHON_LIBRARY
+     NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+     # Avoid finding the .dll in the PATH.  We want the .lib.
+     NO_SYSTEM_ENVIRONMENT_PATH
+     # This is where the static library is usually located
+     PATH_SUFFIXES python${_CURRENT_VERSION}/config
+   )
  
    # For backward compatibility, honour value of PYTHON_INCLUDE_PATH, if