8000 libraries: Move ssdeep-cpp to source_migration by theopolis · Pull Request #6464 · osquery/osquery · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
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

libraries: Move ssdeep-cpp to source_migration #6464

Merged
merged 2 commits into from
May 30, 2020

Conversation

theopolis
Copy link
Member

This moves ssdeep-cpp to source migration (for macOS).

@theopolis theopolis added the libraries For things referring to osquery third party libraries label May 26, 2020
Copy link
Member
@Smjert Smjert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@theopolis Looks good! Just a couple of minor things to look at :).

HAVE_CONFIG_H
)

target_link_libraries(thirdparty_ssdeep-cpp PRIVATE
target_link_libraries(thirdparty_ssdeep-cpp_cpp PRIVATE
thirdparty_cxx_settings
thirdparty_c_settings
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thirdparty_c_settings should be removed from here

if(DEFINED PLATFORM_LINUX)
target_include_directories(thirdparty_ssdeep-cpp_cpp PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/config/linux"
"${library_root}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: maybe dedup "${library_root}" for both macOS and Linux with:

target_include_directories(thirdparty_ssdeep-cpp_cpp PRIVATE
  "${library_root}"
)
target_include_directories(thirdparty_ssdeep-cpp_c PRIVATE
  "${library_root}"
)

outside of the if statements, since it's common for both?

@Smjert Smjert merged commit 34cc6f1 into osquery:master May 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libraries For things referring to osquery third party libraries
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0