From 21b92b69c934edee6dba15a2e821ce776125a89d Mon Sep 17 00:00:00 2001 From: Ryan Ofsky Date: Mon, 3 Feb 2025 08:58:28 -0500 Subject: [PATCH] cmake: EXTERNAL_MPGEN cleanups Suggested by Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> in https://github.com/chaincodelabs/libmultiprocess/pull/142#pullrequestreview-2588097796 --- CMakeLists.txt | 2 +- cmake/TargetCapnpSources.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1901831..934f76ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ if(Libmultiprocess_ENABLE_CLANG_TIDY) set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXECUTABLE}") endif() -set(EXTERNAL_MPGEN "" CACHE STRING "Use the supplied mpgen binary rather than the one built internally") +set(Libmultiprocess_EXTERNAL_MPGEN "" CACHE FILEPATH "If specified, should be full path to an external mpgen binary to use rather than the one built internally.") include("cmake/compat_config.cmake") include("cmake/pthread_checks.cmake") diff --git a/cmake/TargetCapnpSources.cmake b/cmake/TargetCapnpSources.cmake index 0a094376..2c3c42e9 100644 --- a/cmake/TargetCapnpSources.cmake +++ b/cmake/TargetCapnpSources.cmake @@ -61,15 +61,15 @@ function(target_capnp_sources target include_prefix) ) set(MPGEN_BINARY "") - if(EXTERNAL_MPGEN) - set(MPGEN_BINARY "${EXTERNAL_MPGEN}") + if(Libmultiprocess_EXTERNAL_MPGEN) + set(MPGEN_BINARY "${Libmultiprocess_EXTERNAL_MPGEN}") if(NOT EXISTS "${MPGEN_BINARY}") - message(FATAL_ERROR "EXTERNAL_MPGEN: \"${MPGEN_BINARY}\" does not exist.") + message(FATAL_ERROR "Libmultiprocess_EXTERNAL_MPGEN: \"${MPGEN_BINARY}\" does not exist.") endif() elseif(TARGET Libmultiprocess::multiprocess) - set(MPGEN_BINARY $) + set(MPGEN_BINARY Libmultiprocess::mpgen) else() - message(FATAL_ERROR "No usable mpgen. Set EXTERNAL_MPGEN or enable the internal target.") + message(FATAL_ERROR "No usable mpgen. Set Libmultiprocess_EXTERNAL_MPGEN or enable the internal target.") endif() set(generated_headers "")