diff options
| -rw-r--r-- | build/cmake/GenerateConfigModule.cmake | 1 | ||||
| -rw-r--r-- | build/cmake/ThriftConfig.cmake.in | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/build/cmake/GenerateConfigModule.cmake b/build/cmake/GenerateConfigModule.cmake index 9533c8235..26f018a21 100644 --- a/build/cmake/GenerateConfigModule.cmake +++ b/build/cmake/GenerateConfigModule.cmake @@ -40,5 +40,6 @@ if (NOT CYGWIN) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ThriftConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/ThriftConfigVersion.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/FindLibevent.cmake" DESTINATION "${CMAKE_INSTALL_DIR}/thrift") endif() diff --git a/build/cmake/ThriftConfig.cmake.in b/build/cmake/ThriftConfig.cmake.in index c05520094..2f2003bb4 100644 --- a/build/cmake/ThriftConfig.cmake.in +++ b/build/cmake/ThriftConfig.cmake.in @@ -59,7 +59,19 @@ if(@OPENSSL_FOUND@ AND @WITH_OPENSSL@) endif() if(@Libevent_FOUND@ AND @WITH_LIBEVENT@) + if(DEFINED CMAKE_MODULE_PATH) + set(THRIFT_CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) + else() + unset(THRIFT_CMAKE_MODULE_PATH_OLD) + endif() + set(CMAKE_MODULE_PATH "${THRIFT_CMAKE_DIR}") find_dependency(Libevent) + if(DEFINED THRIFT_CMAKE_MODULE_PATH_OLD) + set(CMAKE_MODULE_PATH ${THRIFT_CMAKE_MODULE_PATH_OLD}) + unset(THRIFT_CMAKE_MODULE_PATH_OLD) + else() + unset(CMAKE_MODULE_PATH) + endif() endif() check_required_components(Thrift) |