Use CPM for dependency management #2280
Closed
Conversation
This file contains 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
|
|
lalitb
reviewed
Aug 29, 2023
CMakeLists.txt
Outdated
| @@ -1,7 +1,7 @@ | |||
| # Copyright The OpenTelemetry Authors | |||
| # SPDX-License-Identifier: Apache-2.0 | |||
|
|
|||
| cmake_minimum_required(VERSION 3.1) | |||
| cmake_minimum_required(VERSION 3.20) | |||
There was a problem hiding this comment.
is this minimal version requirement to use CPM?
There was a problem hiding this comment.
Looks like 3.14 is required for CPM.
CMakeLists.txt
Outdated
| @@ -141,7 +144,7 @@ if(NOT DEFINED CMAKE_CXX_STANDARD) | |||
| set(CMAKE_CXX_STANDARD 17) | |||
| endif() | |||
| else() | |||
| set(CMAKE_CXX_STANDARD 11) | |||
| set(CMAKE_CXX_STANDARD 14) | |||
There was a problem hiding this comment.
Why C++14? C++11 is still the supported version. At least for now: #2147
There was a problem hiding this comment.
you're right. C++11 should work.
maztheman
commented
Aug 29, 2023
| @@ -46,7 +46,7 @@ void BM_ParentBasedSamplerConstruction(benchmark::State &state) | |||
| { | |||
| while (state.KeepRunning()) | |||
| { | |||
| benchmark::DoNotOptimize(ParentBasedSampler(std::make_shared<AlwaysOnSampler>())); | |||
| // benchmark::DoNotOptimize(ParentBasedSampler(std::make_shared<AlwaysOnSampler>())); | |||
There was a problem hiding this comment.
opentelemetry-cpp/build/_deps/benchmark-src/include/benchmark/benchmark.h:540:3: error: read-only reference ‘value’ used as ‘asm’ output
[build] 540 | asm volatile("" : "+m"(value) : : "memory");
[build] | ^~~
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #2280 +/- ##
==========================================
- Coverage 87.52% 87.50% -0.01%
==========================================
Files 199 199
Lines 5981 5981
==========================================
- Hits 5234 5233 -1
- Misses 747 748 +1
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
Basic clean up using modern CMake and CPM
For significant contributions please make sure you have completed the following items:
CHANGELOG.mdupdated for non-trivial changes