[Avida-cvs] [Avida2-svn] r26 - trunk/CMakeModules

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2005-02-24 13:08:02 -0500 (Thu, 24 Feb 2005)
New Revision: 26

Modified:
   trunk/CMakeModules/avdFindPython.cmake
Log:

* avdFindPython.cmake:
- cmake variables PYTHON_FRAMEWORK_INCLUDE_PATH, PYTHON_FRAMEWORK_LIBRARY, and
  PYTHON_FRAMEWORK_DEBUG_LIBRARY were incorrectly named, and this was confusing
  the build system. Renamed to PYTHON_INCLUDE_PATH, PYTHON_LIBRARY, and
  PYTHON_DEBUG_LIBRARY, respectively.
- Hid PYTHON_INCLUDE_PATH from user when using Python Framework on OS X.



Modified: trunk/CMakeModules/avdFindPython.cmake
===================================================================
--- trunk/CMakeModules/avdFindPython.cmake	2005-02-24 17:45:06 UTC (rev 25)
+++ trunk/CMakeModules/avdFindPython.cmake	2005-02-24 18:08:02 UTC (rev 26)
@@ -53,30 +53,30 @@
         "Apple-style Python Framework executable."
         FORCE
       )
-      SET(PYTHON_FRAMEWORK_INCLUDE_PATH
+      SET(PYTHON_INCLUDE_PATH
         "${PYTHON_FRAMEWORK_PATH}/Python.framework/Versions/${version}/include/python${version}"
         CACHE INTERNAL
         "Apple-style Python Framework include directory."
         FORCE
       )
-      SET(PYTHON_FRAMEWORK_LIBRARY
+      SET(PYTHON_LIBRARY
         "-F\"${PYTHON_FRAMEWORK_PATH}\" -framework Python"
         CACHE INTERNAL
         "Apple-style Python Framework linking flags."
         FORCE
       )
-      SET(PYTHON_FRAMEWORK_DEBUG_LIBRARY
+      SET(PYTHON_DEBUG_LIBRARY
         "-F\"${PYTHON_FRAMEWORK_PATH}\" -framework Python"
         CACHE INTERNAL
         "Apple-style Python Framework linking flags."
         FORCE
       )
-      SET(PYTHON_INCLUDE_PATH
-        ${PYTHON_FRAMEWORK_INCLUDE_PATH}
-        CACHE PATH
-        "Apple-style Python Framework Include Path."
-        FORCE
-      )
+      #SET(PYTHON_INCLUDE_PATH
+      #  ${PYTHON_INCLUDE_PATH}
+      #  CACHE PATH
+      #  "Apple-style Python Framework Include Path."
+      #  FORCE
+      #)
     ELSE(EXISTS ${PYTHON_FRAMEWORK_PATH})
       SET(PYTHON_EXE_SEARCH_PATHS
         /usr/bin