diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 08:23:26 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 08:23:26 -0800 |
| commit | 388d5007da202a24a422dc2286af59a1e0859cdf (patch) | |
| tree | 644036a54516c8ebcdca764e7d9c4f1a4c9a16f7 | |
| parent | e34866dad21a98e901c188df7e87f37ae5502a88 (diff) | |
| parent | 1683e58d54200dd2889dfdb7141c9555e16b769e (diff) | |
Merge branch 'master' into next
| -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( |