orc 2.0.1 #11
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,13 @@ | ||
| cxx_compiler: # [win] | ||
| - 'vs2019' # [win] | ||
| c_compiler: # [win] | ||
| - 'vs2019' # [win] | ||
|
There was a problem hiding this comment. This can be removed as vs2019 is already a default compiler in a generic cbc.yaml on win64 |
||
|
|
||
| # abseil (use through protobuf includes) now only support MacOS >=10.15, see | ||
| # https://github.com/abseil/abseil-cpp#support | ||
| MACOSX_SDK_VERSION: # [osx and x86_64] | ||
| - "10.15" # [osx and x86_64] | ||
| MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] | ||
| - "10.15" # [osx and x86_64] | ||
| CONDA_BUILD_SYSROOT: # [osx and x86_64] | ||
| - /opt/MacOSX10.15.sdk # [osx and x86_64] | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,22 @@ | ||
| From 651672c8034c07c410aebf0e7667a6a77a31a8d7 Mon Sep 17 00:00:00 2001 | ||
| From: "Korn, Uwe" <[email protected]> | ||
| Date: Tue, 19 Mar 2019 11:16:02 +0100 | ||
| Subject: [PATCH 1/5] Deactivate aggressive failures on warnings | ||
|
|
||
| --- | ||
| CMakeLists.txt | 2 ++ | ||
| 1 file changed, 2 insertions(+) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 47a6d66..47832b5 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -160,6 +160,8 @@ else () | ||
| add_compile_definitions(ENABLE_METRICS=0) | ||
| endif () | ||
|
|
||
| +set(WARN_FLAGS "") | ||
| + | ||
| enable_testing() | ||
|
|
||
| INCLUDE(CheckSourceCompiles) | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,23 @@ | ||
| From 43d34904ff88211396be6a3572718c3d3bef6cb9 Mon Sep 17 00:00:00 2001 | ||
| From: Nehal J Wani <[email protected]> | ||
| Date: Fri, 25 Sep 2020 14:49:59 -0400 | ||
| Subject: [PATCH 2/5] Don't force orc to be a static library, let end user | ||
| control it | ||
|
|
||
| --- | ||
| c++/src/CMakeLists.txt | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt | ||
| index 33ad584..f5a806a 100644 | ||
| --- a/c++/src/CMakeLists.txt | ||
| +++ b/c++/src/CMakeLists.txt | ||
| @@ -206,7 +206,7 @@ if(BUILD_ENABLE_AVX512) | ||
| BpackingAvx512.cc) | ||
| endif(BUILD_ENABLE_AVX512) | ||
|
|
||
| -add_library (orc STATIC ${SOURCE_FILES}) | ||
| +add_library (orc ${SOURCE_FILES}) | ||
|
|
||
| target_link_libraries (orc | ||
| orc::protobuf | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| From d65b2bc5a72aa975acb84cafca4ecff9e859fdc4 Mon Sep 17 00:00:00 2001 | ||
| From: Nehal J Wani <[email protected]> | ||
| Date: Sat, 4 Feb 2023 20:50:40 +0000 | ||
| Subject: [PATCH 3/5] CMake: Add more hints for libraries on Windows | ||
|
|
||
| --- | ||
| cmake_modules/FindLZ4.cmake | 2 +- | ||
| cmake_modules/FindProtobuf.cmake | 4 ++-- | ||
| 2 files changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/cmake_modules/FindLZ4.cmake b/cmake_modules/FindLZ4.cmake | ||
| index b1557f4..8061dda 100644 | ||
| --- a/cmake_modules/FindLZ4.cmake | ||
| +++ b/cmake_modules/FindLZ4.cmake | ||
| @@ -33,7 +33,7 @@ find_path (LZ4_INCLUDE_DIR lz4.h HINTS | ||
| NO_DEFAULT_PATH | ||
| PATH_SUFFIXES "include") | ||
|
|
||
| -find_library (LZ4_LIBRARY NAMES lz4 HINTS | ||
| +find_library (LZ4_LIBRARY NAMES lz4 liblz4 HINTS | ||
| ${_lz4_path} | ||
| PATH_SUFFIXES "lib" "lib64") | ||
|
|
||
| diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake | ||
| index cca7c8b..5a1a9d0 100644 | ||
| --- a/cmake_modules/FindProtobuf.cmake | ||
| +++ b/cmake_modules/FindProtobuf.cmake | ||
| @@ -63,7 +63,7 @@ else() | ||
| NO_DEFAULT_PATH | ||
| PATH_SUFFIXES "include") | ||
|
|
||
| - find_library (PROTOBUF_LIBRARY NAMES protobuf HINTS | ||
| + find_library (PROTOBUF_LIBRARY NAMES protobuf libprotobuf HINTS | ||
| ${_protobuf_path} | ||
| PATH_SUFFIXES "lib") | ||
|
|
||
| @@ -71,7 +71,7 @@ else() | ||
| ${_protobuf_path} | ||
| PATH_SUFFIXES "lib") | ||
|
|
||
| - find_library (PROTOC_LIBRARY NAMES protoc HINTS | ||
| + find_library (PROTOC_LIBRARY NAMES protoc libprotoc HINTS | ||
| ${_protobuf_path} | ||
| PATH_SUFFIXES "lib") | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| From 699586d51ca326ce8d265dfd986439f70989bea3 Mon Sep 17 00:00:00 2001 | ||
| From: "H. Vetinari" <[email protected]> | ||
| Date: Sun, 5 Feb 2023 15:32:08 +1100 | ||
| Subject: [PATCH 4/5] don't force lib destination | ||
|
|
||
| --- | ||
| c++/src/CMakeLists.txt | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt | ||
| index f5a806a..d6dcca0 100644 | ||
| --- a/c++/src/CMakeLists.txt | ||
| +++ b/c++/src/CMakeLists.txt | ||
| @@ -219,4 +219,4 @@ target_link_libraries (orc | ||
|
|
||
| add_dependencies(orc orc-format_ep) | ||
|
|
||
| -install(TARGETS orc DESTINATION lib) | ||
| +install(TARGETS orc) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| From e6284a57dff236e8617f5df8bfc7d2ccba951551 Mon Sep 17 00:00:00 2001 | ||
| From: Nehal J Wani <[email protected]> | ||
| Date: Sun, 4 Jun 2023 10:35:32 +0100 | ||
| Subject: [PATCH 5/5] Check for protobuf config based module | ||
|
|
||
| --- | ||
| cmake_modules/FindProtobuf.cmake | 18 ++++++++++++++++++ | ||
| 1 file changed, 18 insertions(+) | ||
|
|
||
| diff --git a/cmake_modules/FindProtobuf.cmake b/cmake_modules/FindProtobuf.cmake | ||
| index 5a1a9d0..9fdc98c 100644 | ||
| --- a/cmake_modules/FindProtobuf.cmake | ||
| +++ b/cmake_modules/FindProtobuf.cmake | ||
| @@ -26,6 +26,24 @@ | ||
| # PROTOBUF_EXECUTABLE: location of protoc | ||
|
|
||
|
|
||
| +find_package(Protobuf CONFIG) | ||
| +if(Protobuf_FOUND) | ||
| + set(PROTOBUF_LIBRARY protobuf::libprotobuf) | ||
| + set(PROTOBUF_STATIC_LIB PROTOBUF_STATIC_LIB-NOTFOUND) | ||
| + set(PROTOC_LIBRARY protobuf::libprotoc) | ||
| + set(PROTOC_STATIC_LIB PROTOC_STATIC_LIB-NOTFOUND) | ||
| + get_target_property(target_type protobuf::libprotobuf TYPE) | ||
| + if(target_type STREQUAL "STATIC_LIBRARY") | ||
| + set(PROTOBUF_STATIC_LIB protobuf::libprotobuf) | ||
| + endif() | ||
| + get_target_property(target_type protobuf::libprotoc TYPE) | ||
| + if(target_type STREQUAL "STATIC_LIBRARY") | ||
| + set(PROTOC_STATIC_LIB protobuf::libprotoc) | ||
| + endif() | ||
| + get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotoc INTERFACE_INCLUDE_DIRECTORIES) | ||
| + return() | ||
| +endif() | ||
| + | ||
| if( NOT "${PROTOBUF_HOME}" STREQUAL "") | ||
| file (TO_CMAKE_PATH "${PROTOBUF_HOME}" _protobuf_path) | ||
| endif() |
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.
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.
-DPROTOBUF_USE_DLLSsounds like a windows flag, not a macos one