This is an automated email from the ASF dual-hosted git repository. jensg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/thrift.git
commit c8e46cf861cd1ebae273e968bb3995f778d998f1 Author: Tobias Mayer <[email protected]> AuthorDate: Sun Feb 16 10:36:11 2020 +0100 THRIFT-5097: Fix exported version in cmake module Patch: Tobias Mayer This closes #2010 --- build/cmake/ThriftConfig.cmake.in | 3 ++- lib/cpp/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/cmake/ThriftConfig.cmake.in b/build/cmake/ThriftConfig.cmake.in index c304da0..3fb208f 100644 --- a/build/cmake/ThriftConfig.cmake.in +++ b/build/cmake/ThriftConfig.cmake.in @@ -17,13 +17,14 @@ # under the License. # -set(THRIFT_VERSION ${thrift_VERSION}) +set(THRIFT_VERSION @thrift_VERSION@) @PACKAGE_INIT@ set_and_check(THRIFT_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") set_and_check(THRIFT_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@") set_and_check(THRIFT_BIN_DIR "@PACKAGE_BIN_INSTALL_DIR@") +set(THRIFT_COMPILER "${THRIFT_BIN_DIR}/thrift") if (NOT TARGET thrift::thrift) include("${THRIFT_CMAKE_DIR}/thriftTargets.cmake") diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index e92da60..9b987ae 100755 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -151,7 +151,7 @@ endif() ADD_PKGCONFIG_THRIFT(thrift) if(WITH_LIBEVENT) - find_package(Libevent REQUIRED) # Libevent comes with CMake support form upstream + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES})
