From 96995fe8836e0d11bcd20850b3cce2c826ba3aa9 Mon Sep 17 00:00:00 2001 From: Patrick Schlangen Date: Sun, 5 Feb 2023 18:43:25 +0100 Subject: [PATCH] Improve Thrift CMake modules --- CMake/Modules/FindLibThrift.cmake | 4 ++-- CMake/Modules/FindThriftCompiler.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/Modules/FindLibThrift.cmake b/CMake/Modules/FindLibThrift.cmake index 6169633d0..2bf61bb5a 100644 --- a/CMake/Modules/FindLibThrift.cmake +++ b/CMake/Modules/FindLibThrift.cmake @@ -3,5 +3,5 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(LIBTHRIFT REQUIRED thrift) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(libthrift DEFAULT_MSG LIBTHRIFT_LIBRARIES LIBTHRIFT_INCLUDE_DIRS LIBTHRIFT_LIBDIR) -mark_as_advanced(LIBTHRIFT_INCLUDE_DIRS LIBTHRIFT_LIBRARIES LIBTHRIFT_LIBDIR) +find_package_handle_standard_args(LibThrift DEFAULT_MSG LIBTHRIFT_LIBRARIES LIBTHRIFT_INCLUDEDIR LIBTHRIFT_LIBDIR) +mark_as_advanced(LIBTHRIFT_INCLUDEDIR LIBTHRIFT_LIBRARIES LIBTHRIFT_LIBDIR) diff --git a/CMake/Modules/FindThriftCompiler.cmake b/CMake/Modules/FindThriftCompiler.cmake index 2491cbfa2..cc0834ecf 100644 --- a/CMake/Modules/FindThriftCompiler.cmake +++ b/CMake/Modules/FindThriftCompiler.cmake @@ -1,7 +1,7 @@ find_program(THRIFT_COMPILER NAMES thrift) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(thrift DEFAULT_MSG THRIFT_COMPILER) +find_package_handle_standard_args(ThriftCompiler DEFAULT_MSG THRIFT_COMPILER) mark_as_advanced(THRIFT_COMPILER) macro(thrift_compile FILENAME GENERATOR OUTPUTDIR)