From 173d9984ef62c07b331f4cb1e6138e8993dfb92f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 13 Jan 2017 18:57:57 +0000 Subject: Bindings: Fix logic for finding the clang driver Use find_package to locate the executable. --- find-modules/FindPythonModuleGeneration.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'find-modules/FindPythonModuleGeneration.cmake') diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake index 30fb5125..7a4f7d45 100644 --- a/find-modules/FindPythonModuleGeneration.cmake +++ b/find-modules/FindPythonModuleGeneration.cmake @@ -251,11 +251,11 @@ include(CMakeParseArguments) set(GPB_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR}) function(_compute_implicit_include_dirs) - set(CLANG_CXX_DRIVER clang++${_GPB_CLANG_SUFFIX}) - if (NOT EXISTS ${CLANG_CXX_DRIVER}) - set(CLANG_CXX_DRIVER clang++) + find_program(_GBP_CLANG_CXX_DRIVER_PATH clang++-${_GPB_CLANG_SUFFIX}) + if (NOT _GBP_CLANG_CXX_DRIVER_PATH) + message(FATAL_ERROR "Failed to find clang driver corresponding to ${libclang_LIBRARY}") endif() - execute_process(COMMAND ${CLANG_CXX_DRIVER} -v -E -x c++ - + execute_process(COMMAND ${_GBP_CLANG_CXX_DRIVER_PATH} -v -E -x c++ - ERROR_VARIABLE _compilerOutput OUTPUT_VARIABLE _compilerStdout INPUT_FILE /dev/null) -- cgit v1.2.1