From 4139f15de65ec1d1670cceb95b4c22b52f5448c3 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Fri, 11 May 2001 10:27:46 -0400 Subject: minor fixes and new python module --- Modules/FindJNI.cmake | 2 +- Modules/FindPythonLibs.cmake | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Modules/FindPythonLibs.cmake diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index a58bada..a809b8f 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -8,7 +8,7 @@ # JAVA_AWT_INCLUDE_PATH = the path to where jni.h can be found # -FIND_LIBRARY(JAVA_AWT_LIB_PATH jawt PATHS /usr/lib /usr/local/lib) +FIND_LIBRARY(JAVA_AWT_LIBRARY jawt PATHS /usr/lib /usr/local/lib) # add in the include path FIND_PATH(JAVA_INCLUDE_PATH jni.h /usr/include /usr/local/include) diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake new file mode 100644 index 0000000..13cbea5 --- /dev/null +++ b/Modules/FindPythonLibs.cmake @@ -0,0 +1,33 @@ +# +# This module finds if Python is installed and determines where the +# include files and libraries are. It also determines what the name of +# the library is. This code sets the following variables: +# +# PYTHON_LIBRARY = the full path to the library found +# PYTHON_INCLUDE_PATH = the path to where tcl.h can be found +# PYTHON_DEBUG_LIBRARY = the full path to the debug library found +# + +FIND_LIBRARY(PYTHON_DEBUG_LIBRARY python python21_d python20_d + PATHS + /usr/lib + /usr/local/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath]/libs/Debug + [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.0\InstallPath]/libs/Debug +) + +FIND_LIBRARY(PYTHON_LIBRARY python python21 python20 + PATHS + /usr/lib + /usr/local/lib + [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath]/libs + [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.0\InstallPath]/libs +) + +FIND_PATH(PYTHON_INCLUDE_PATH Python.h + /usr/include + /usr/local/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.1\InstallPath]/include + [HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.0\InstallPath]/include +) + -- cgit v0.12