You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2021/09/01 21:25:09 UTC
[arrow-cookbook] branch main updated: Added clang-tools (which
includes clang-tidy) to environment.yml (#61)
This is an automated email from the ASF dual-hosted git repository.
westonpace pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-cookbook.git
The following commit(s) were added to refs/heads/main by this push:
new 6f4c484 Added clang-tools (which includes clang-tidy) to environment.yml (#61)
6f4c484 is described below
commit 6f4c484219efbdc46a6677363db2d4bbc000a0f2
Author: Weston Pace <we...@gmail.com>
AuthorDate: Wed Sep 1 11:25:06 2021 -1000
Added clang-tools (which includes clang-tidy) to environment.yml (#61)
* Added clang-tools (which includes clang-tidy) to environment.yml
* Added libstdc++ to the conda environment
* Only add clang flags if the compiler is clang
---
cpp/code/CMakeLists.txt | 3 +++
cpp/environment.yml | 9 +++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cpp/code/CMakeLists.txt b/cpp/code/CMakeLists.txt
index 8080271..e24a245 100644
--- a/cpp/code/CMakeLists.txt
+++ b/cpp/code/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.19)
project(arrow-cookbook)
set(CMAKE_CXX_STANDARD 17)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
+endif()
# Add googletest
include(FetchContent)
diff --git a/cpp/environment.yml b/cpp/environment.yml
index 690182a..ae924a3 100644
--- a/cpp/environment.yml
+++ b/cpp/environment.yml
@@ -15,6 +15,7 @@ dependencies:
- aws-sdk-cpp=1.8.186=hb4091e7_3
- babel=2.9.1=pyh44b312d_0
- binutils_impl_linux-64=2.36.1=h193b22a_2
+ - binutils_linux-64=2.36=hf3e587d_0
- brotlipy=0.7.0=py39h3811e60_1001
- bzip2=1.0.8=h7f98852_4
- c-ares=1.17.1=h7f98852_1
@@ -25,6 +26,7 @@ dependencies:
- charset-normalizer=2.0.0=pyhd8ed1ab_0
- clang=11.1.0=ha770c72_1
- clang-11=11.1.0=default_ha53f305_1
+ - clang-tools=11.1.0=default_ha53f305_1
- clangxx=11.1.0=default_ha53f305_1
- cmake=3.21.1=h8897547_0
- colorama=0.4.4=pyh9f0ad1d_0
@@ -32,9 +34,12 @@ dependencies:
- docutils=0.17.1=py39hf3d152e_0
- expat=2.4.1=h9c3ff4c_0
- gcc_impl_linux-64=11.1.0=h6b5115b_8
+ - gcc_linux-64=11.1.0=h97fdae6_0
- gflags=2.2.2=he1b5a44_1004
- glog=0.5.0=h48cff8f_0
- grpc-cpp=1.39.0=h36ce80c_1
+ - gxx_impl_linux-64=11.1.0=h6b5115b_8
+ - gxx_linux-64=11.1.0=h33c4e4b_0
- idna=3.1=pyhd3deb0d_0
- imagesize=1.2.0=py_0
- jinja2=3.0.1=pyhd8ed1ab_0
@@ -64,6 +69,7 @@ dependencies:
- libprotobuf=3.16.0=h780b84a_0
- libsanitizer=11.1.0=h56837e0_8
- libssh2=1.9.0=ha56f1ee_6
+ - libstdcxx-devel_linux-64=11.1.0=h80e7780_8
- libstdcxx-ng=11.1.0=h56837e0_8
- libthrift=0.14.2=he6d91bd_1
- libutf8proc=2.6.1=h7f98852_0
@@ -73,7 +79,7 @@ dependencies:
- markupsafe=2.0.1=py39h3811e60_0
- ncurses=6.2=h58526e2_4
- numpy=1.21.1=py39hdbf815f_0
- - openssl=1.1.1k=h7f98852_0
+ - openssl=1.1.1k=h7f98852_1
- orc=1.6.9=h58a87f1_0
- packaging=21.0=pyhd8ed1ab_0
- parquet-cpp=1.5.1=2
@@ -112,4 +118,3 @@ dependencies:
- xz=5.2.5=h516909a_1
- zlib=1.2.11=h516909a_1010
- zstd=1.5.0=ha95c52a_0
-prefix: /home/pace/anaconda3/envs/cookbook