diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 08:21:51 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 08:21:51 -0800 |
| commit | 9dfc6c14c6424b78facfe75bc110dcf6eb14448e (patch) | |
| tree | 709341bf9eb7ed0da633031e82710d3566f25fdc | |
| parent | 3a2cf6eacc8cfca81fc83d0411a02c972e5eee18 (diff) | |
| parent | 9e2eb46fe625f4ac04cc3e85c791b5e9dd903689 (diff) | |
Merge remote-tracking branch 'tom/thrift_xcompile_bin' into maint
| -rw-r--r-- | cmake/Modules/FindThrift.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/Modules/FindThrift.cmake b/cmake/Modules/FindThrift.cmake index 4702f90d78..e5a8df1304 100644 --- a/cmake/Modules/FindThrift.cmake +++ b/cmake/Modules/FindThrift.cmake @@ -34,7 +34,11 @@ FIND_LIBRARY(THRIFT_LIBRARIES ) # Get the thrift binary to build our files during cmake -FIND_PROGRAM(THRIFT_BIN thrift) +if (CMAKE_CROSSCOMPILING) + FIND_PROGRAM(THRIFT_BIN thrift NO_CMAKE_FIND_ROOT_PATH) +else (CMAKE_CROSSCOMPILING) + FIND_PROGRAM(THRIFT_BIN thrift) +endif(CMAKE_CROSSCOMPILING) # Use binary to get version string and test against THRIFT_REQ_VERSION EXECUTE_PROCESS( |