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

[cmake-commits at cmake.org]

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

Modified Files:
	FindPythonLibs.cmake 
Log Message:
Do not force frameworks on Mac OS X - never worked well.


Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.46
retrieving revision 1.47
diff -C 2 -d -r1.46 -r1.47
*** FindPythonLibs.cmake	14 Dec 2009 19:15:31 -0000	1.46
--- FindPythonLibs.cmake	17 Feb 2010 16:35:17 -0000	1.47
***************
*** 90,109 ****
  )
  
- # Python Should be built and installed as a Framework on OSX
- IF(Python_FRAMEWORKS)
-   # If a framework has been selected for the include path,
-   # make sure "-framework" is used to link it.
-   IF("${PYTHON_INCLUDE_DIR}" MATCHES "Python\\.framework")
-     SET(PYTHON_LIBRARY "")
-     SET(PYTHON_DEBUG_LIBRARY "")
-   ENDIF("${PYTHON_INCLUDE_DIR}" MATCHES "Python\\.framework")
-   IF(NOT PYTHON_LIBRARY)
-     SET (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-   ENDIF(NOT PYTHON_LIBRARY)
-   IF(NOT PYTHON_DEBUG_LIBRARY)
-     SET (PYTHON_DEBUG_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-   ENDIF(NOT PYTHON_DEBUG_LIBRARY)
- ENDIF(Python_FRAMEWORKS)
- 
  # We use PYTHON_INCLUDE_DIR, PYTHON_LIBRARY and PYTHON_DEBUG_LIBRARY for the
  # cache entries because they are meant to specify the location of a single
--- 90,93 ----