-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
fix(deps): swap certify dependency to a fork with fixed cmake configu… #449
Conversation
@@ -158,7 +158,6 @@ set(Boost_USE_STATIC_RUNTIME OFF) | |||
find_package(Boost 1.81 REQUIRED COMPONENTS json url coroutine) | |||
message(STATUS "LaunchDarkly: using Boost v${Boost_VERSION}") | |||
|
|||
include(${CMAKE_FILES}/certify.cmake) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since certify is really a dependency of foxy, moving this into foxy.
@@ -1,8 +0,0 @@ | |||
get_filename_component(launchdarkly-client_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) | |||
include(CMakeFindDependencyMacro) | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file wasn't used and must have snuck in a long time ago accidentally.
@@ -153,6 +158,13 @@ target_link_libraries( | |||
certify::core | |||
) | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The original djarek/certify
adds CoreFoundation
and Security
on to the linker explicitly. This fork does not.
@@ -167,7 +179,8 @@ option(BUILD_TESTING "Build Foxy Testsuite" OFF) | |||
if (BUILD_TESTING) | |||
include(CTest) | |||
|
|||
find_package(Catch2 CONFIG REQUIRED) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given I'm swapping out the certify library, I figured it would be good to have foxy's tests enabled. This necessitates grabbing catch2 with FetchContent.
GIT_TAG 9185a824e2085b5632be542c0377204a05a4fa40 | ||
) | ||
|
||
# The tests in certify don't compile. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TODO: add a todo here to see if I can get these compiling.
4301fa7
to
1d04d44
Compare
@@ -17,7 +17,7 @@ | |||
|
|||
#include <memory> | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new Catch2 has changed their headers around.
1d04d44
to
35a256d
Compare
…ration