Skip to content

scripted-diff: s/Libmultiprocess_EXTERNAL_MPGEN/MPGEN_EXECUTABLE/g #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2025
Merged

scripted-diff: s/Libmultiprocess_EXTERNAL_MPGEN/MPGEN_EXECUTABLE/g #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(Libmultiprocess_ENABLE_CLANG_TIDY)
set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXECUTABLE}")
endif()

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.")
set(MPGEN_EXECUTABLE "" 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")
Expand Down
8 changes: 4 additions & 4 deletions cmake/TargetCapnpSources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ function(target_capnp_sources target include_prefix)
)

set(MPGEN_BINARY "")
if(Libmultiprocess_EXTERNAL_MPGEN)
set(MPGEN_BINARY "${Libmultiprocess_EXTERNAL_MPGEN}")
if(MPGEN_EXECUTABLE)
set(MPGEN_BINARY "${MPGEN_EXECUTABLE}")
if(NOT EXISTS "${MPGEN_BINARY}")
message(FATAL_ERROR "Libmultiprocess_EXTERNAL_MPGEN: \"${MPGEN_BINARY}\" does not exist.")
message(FATAL_ERROR "MPGEN_EXECUTABLE: \"${MPGEN_BINARY}\" does not exist.")
endif()
elseif(TARGET Libmultiprocess::multiprocess)
set(MPGEN_BINARY Libmultiprocess::mpgen)
else()
message(FATAL_ERROR "No usable mpgen. Set Libmultiprocess_EXTERNAL_MPGEN or enable the internal target.")
message(FATAL_ERROR "No usable mpgen. Set MPGEN_EXECUTABLE or enable the internal target.")
endif()

set(generated_headers "")
Expand Down