commit 7f47792bf288c3dca049d04de06d57d2f060abba
author Marco Molteni <marco.molteni@laposte.net> Wed Apr 15 20:46:48 2015 +0200
committer Roger Meier <roger@apache.org> Wed Apr 15 22:04:49 2015 +0200
tree 78308529c1b194d87600c2eaf6c30d8b8442f80c
parent a242c28ba16012ba480c5fbac88bedceaf3aed57

THRIFT-3097 cmake targets unconditionally depend on optional libraries

build/cmake/DefineOptions.cmake

diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake
index f2eb76d..7d8b032 100644
--- a/build/cmake/DefineOptions.cmake
+++ b/build/cmake/DefineOptions.cmake
@@ -24,7 +24,7 @@
 option(BUILD_COMPILER "Build Thrift compiler" ON)
 option(BUILD_TESTING "Build with unit tests" ON)
 option(BUILD_EXAMPLES "Build examples" ON)
-option(BUILD_LIBRARIES "Build Thrfit libraries" ON)
+option(BUILD_LIBRARIES "Build Thrift libraries" ON)
 
 # Libraries to build
 
@@ -74,9 +74,10 @@
                        "BUILD_LIBRARIES;JAVA_FOUND;ANT_FOUND" OFF)
 
 # Python
-include(FindPythonInterp QUIET)
+include(FindPythonInterp QUIET) # for Python executable
+include(FindPythonLibs QUIET) # for Python.h
 CMAKE_DEPENDENT_OPTION(WITH_PYTHON "Build Python library" ON
-                       "BUILD_LIBRARIES;PYTHONINTERP_FOUND" OFF)
+                       "BUILD_LIBRARIES;PYTHONLIBS_FOUND" OFF)
 
 # Common library options
 option(WITH_SHARED_LIB "Build shared libraries" ON)