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

Follow up for the CMake refactoring #1249

Merged
merged 17 commits into from
Dec 21, 2020
Merged

Follow up for the CMake refactoring #1249

merged 17 commits into from
Dec 21, 2020

Conversation

tobim
Copy link
Member

@tobim tobim commented Dec 18, 2020

📔 Description

  • A few name changes weren't applied globally
  • VAST_ENABLE_ASSERTIONS was broken.
  • Unconditionally enable -Wundef
  • Move defines back to config.hpp
  • Synchonize definition names between CMake and C++

📝 Checklist

  • All user-facing changes have changelog entries.
  • The PR description contains instructions for the reviewer, if necessary.

🎯 Review Instructions

By commit.

@tobim tobim added maintenance Tasks for keeping up the infrastructure bug Incorrect behavior labels Dec 18, 2020
@tobim tobim force-pushed the topic/cmake-follow-up branch 2 times, most recently from f900e8b to 46e7465 Compare December 20, 2020 20:46
@tobim tobim requested a review from mavam December 21, 2020 09:26
@mavam
Copy link
Member

mavam commented Dec 21, 2020

The new CMake summary prints this:

-- The following features have been enabled:

 * VAST_ENABLE_RELOCATABLE_INSTALLATIONS, enable relocatable installations.
 * VAST_ENABLE_SDT, generate USDT tracepoint instrumentation.
 * VAST_ENABLE_ASSERTIONS, enable assertions.
 * BUILD_SHARED_LIBS, build shared instead of static library.
 * VAST_ENABLE_DEVELOPER_MODE, enables build settings for a nicer development environment.
 * VAST_ENABLE_BUNDLED_SCHEMAS, install bundled schemas with VAST.
 * VAST_ENABLE_ARROW, build with Apache Arrow support.
 * VAST_ENABLE_PCAP, build with PCAP support.
 * VAST_ENABLE_OPENSSL, encrypt network communication.
 * VAST_ENABLE_UNIT_TESTS, build unit tests for libvast.
 * VAST_ENABLE_VAST, build the standalone vast binary.

Why does BUILD_SHARED_LIBS have no VAST_ prefix?

@tobim
Copy link
Member Author

tobim commented Dec 21, 2020

@mavam that variable is defined by CMake itself, we just consider it important enough to include it in the summary.

Copy link
Member

@mavam mavam left a comment

Choose a reason for hiding this comment

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

The branch builds fine for me, and since CI is green, I think green-lighting this makes sense.

I do have a few questions though.

libvast/CMakeLists.txt Outdated Show resolved Hide resolved
libvast/vast/detail/narrow.hpp Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
@mavam
Copy link
Member

mavam commented Dec 21, 2020

Can we remove this "noise" in the CMake run?

-- CREATING CAF TARGETS
-- Found CAF
-- Found CAF: /usr/local/lib/libcaf_core.dylib;/usr/local/lib/libcaf_io.dylib;/usr/local/lib/libcaf_openssl.dylib (found version "0.17.6") found components: openssl
-- CREATING CAF TARGETS

The all-caps comments probably don't need to be in here, right?

@mavam
Copy link
Member

mavam commented Dec 21, 2020

that variable is defined by CMake itself, we just consider it important enough to include it in the summary.

Maybe move it to the top/bottom then? Otherwise it looks like a bug.

Copy link
Member

@mavam mavam left a comment

Choose a reason for hiding this comment

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

After your latest commit, my only remaining concern would be the left-over TODO.

@tobim tobim merged commit 57d0706 into master Dec 21, 2020
@tobim tobim deleted the topic/cmake-follow-up branch December 21, 2020 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Incorrect behavior maintenance Tasks for keeping up the infrastructure
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants