Conversation
Contributor
Author
|
Moving to draft since I need to fix CI as well. |
frabert
reviewed
May 19, 2025
| llvm_map_components_to_libnames(llvm_libs support core irreader bitreader bitwriter) | ||
| find_package(Clang CONFIG REQUIRED) | ||
|
|
||
| find_package(MLIR 20 CONFIG REQUIRED) |
ekilmer
requested changes
May 23, 2025
Comment on lines
60
to
76
| include(FetchContent) | ||
| FetchContent_Declare(cpp-httplib | ||
| GIT_REPOSITORY https://github.com/yhirose/cpp-httplib.git | ||
| GIT_TAG v0.20.0 | ||
| ) | ||
| FetchContent_MakeAvailable(cpp-httplib) | ||
| set(CPP_HTTPLIB_INCLUDE_DIRS "${cpp-httplib_SOURCE_DIR}") | ||
|
|
||
| find_path(CPP_HTTPLIB_INCLUDE_DIRS "httplib.h") | ||
| target_include_directories(${RELLIC_XREF} PRIVATE ${CPP_HTTPLIB_INCLUDE_DIRS}) | ||
|
|
||
| target_link_libraries(${RELLIC_XREF} | ||
| PRIVATE | ||
| "${PROJECT_NAME}_cxx_settings" | ||
| "${PROJECT_NAME}" | ||
| gflags::gflags | ||
| gflags | ||
| ) |
Contributor
There was a problem hiding this comment.
IMO this should be gated behind an option like
option(RELLIC_FIND_ALL_EXTERNAL_DEPENDENCIES "Use find_package for ALL dependencies" OFF)
in cmake/options.cmake. At least let the user choose to provide their own cpp-httplib, even if it's untested by default. Most users won't care, which is fine, and it'll do the right thing because it's OFF by default.
Also, we should use the target httplib::httplib instead of CPP_HTTPLIB_INCLUDE_DIRS.
tools/CMakeLists.txt
Outdated
| "${PROJECT_NAME}_cxx_settings" | ||
| "${PROJECT_NAME}" | ||
| gflags::gflags | ||
| gflags |
Contributor
There was a problem hiding this comment.
Why is this changing? gflags provides official support for gflags::gflags
LLVM and CLANG include dirs should be brought in via target_link_libraries but it would not compile on MacOS for me without these changes making it explicit.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The PR changes support to build with llvm 20 and cmake changes to move away from cxx-common dependency