-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue#18 and Issue #25: WIP changes to support Accumulo 2.x and remov… (
#27) * Issue#18 and Issue #25: WIP changes to support Accumulo 2.x and remove some warnings * Add thrift definitions from 2.x * update * incremental commit * add loggers * Remove libz shared object and boost io streams as external dependencies * fix tablet caching * update cmake * update cmake * fix issues on osx * minor update
- Loading branch information
Showing
156 changed files
with
90,268 additions
and
1,241 deletions.
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 |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| function(use_bundled_zlib SOURCE_DIR BINARY_DIR) | ||
| message("Using bundled zlib") | ||
| if (WIN32) | ||
| string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type) | ||
| if (build_type MATCHES relwithdebinfo OR build_type MATCHES release) | ||
| set(BYPRODUCT "thirdparty/zlib-src/zlibstatic.lib") | ||
| else() | ||
| set(BYPRODUCT "thirdparty/zlib-src/zlibstaticd.lib") | ||
| endif() | ||
| else() | ||
| set(BYPRODUCT "thirdparty/zlib-src/libz.a") | ||
| endif() | ||
| ExternalProject_Add( | ||
| zlib-external | ||
| BUILD_IN_SOURCE true | ||
| GIT_REPOSITORY "https://github.com/madler/zlib.git" | ||
| GIT_TAG "cacf7f1d4e3d44d871b605da3b647f07d718623f" # Version 1.2.11 | ||
| SOURCE_DIR "${BINARY_DIR}/thirdparty/zlib-src" | ||
| CMAKE_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" | ||
| "-D_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/zlib-install" | ||
| BUILD_BYPRODUCTS ${BYPRODUCT} | ||
| INSTALL_COMMAND "" | ||
| ) | ||
|
|
||
|
|
||
| add_library(z STATIC IMPORTED) | ||
| set_target_properties(z PROPERTIES IMPORTED_LOCATION "${BINARY_DIR}/${BYPRODUCT}") | ||
|
|
||
| set(ZLIB_BYPRODUCT "${BINARY_DIR}/${BYPRODUCT}" CACHE STRING "" FORCE) | ||
| set(ZLIB_BYPRODUCT_INCLUDE "${BINARY_DIR}/thirdparty/zlib-src/" CACHE STRING "" FORCE) | ||
| set(ZLIB_BIN_DIR "${BINARY_DIR}/thirdparty/zlib-src/" CACHE STRING "" FORCE) | ||
|
|
||
| add_dependencies(z zlib-external) | ||
| set(ZLIB_FOUND "YES" CACHE STRING "" FORCE) | ||
| set(ZLIB_INCLUDE_DIR "${ZLIB_BYPRODUCT_INCLUDE}" CACHE STRING "" FORCE) | ||
| set(ZLIB_INCLUDE_DIRS "${ZLIB_BYPRODUCT_INCLUDE}" CACHE STRING "" FORCE) | ||
|
|
||
| set(ZLIB_LIBRARY "${BINARY_DIR}/${BYPRODUCT}" CACHE STRING "" FORCE) | ||
| set(ZLIB_LIBRARIES "${ZLIB_LIBRARY}" CACHE STRING "" FORCE) | ||
| set(ZLIB_LIBRARY_RELEASE "${ZLIB_LIBRARY}" CACHE STRING "" FORCE) | ||
| set(ZLIB_LIBRARY_DEBUG "${ZLIB_LIBRARY}" CACHE STRING "" FORCE) | ||
|
|
||
| endfunction(use_bundled_zlib) |
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 |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| # Dummy OpenSSL find for when we use bundled version | ||
|
|
||
| set(OPENSSL_FOUND "YES" CACHE STRING "" FORCE) | ||
| set(OPENSSL_INCLUDE_DIR "${LIBRESSL_BIN_DIR}/include" CACHE STRING "" FORCE) | ||
| set(OPENSSL_CRYPTO_LIBRARY "${LIBRESSL_BIN_DIR}/lib/${BYPRODUCT_PREFIX}crypto${BYPRODUCT_SUFFIX}" CACHE STRING "" FORCE) | ||
| set(OPENSSL_SSL_LIBRARY "${LIBRESSL_BIN_DIR}/lib/${BYPRODUCT_PREFIX}ssl${BYPRODUCT_SUFFIX}" CACHE STRING "" FORCE) | ||
| set(OPENSSL_LIBRARIES "${LIBRESSL_BIN_DIR}/lib/${BYPRODUCT_PREFIX}tls${BYPRODUCT_SUFFIX}" ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} CACHE STRING "" FORCE) | ||
| set(OPENSSL_VERSION "1.0.2" CACHE STRING "" FORCE) | ||
|
|
||
| if(NOT TARGET OpenSSL::Crypto ) | ||
| add_library(OpenSSL::Crypto UNKNOWN IMPORTED) | ||
| set_target_properties(OpenSSL::Crypto PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}") | ||
|
|
||
| set_target_properties(OpenSSL::Crypto PROPERTIES | ||
| IMPORTED_LINK_INTERFACE_LANGUAGES "C" | ||
| IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}") | ||
|
|
||
| endif() | ||
|
|
||
| if(NOT TARGET OpenSSL::SSL | ||
| ) | ||
| add_library(OpenSSL::SSL UNKNOWN IMPORTED) | ||
| set_target_properties(OpenSSL::SSL PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}") | ||
| set_target_properties(OpenSSL::SSL PROPERTIES | ||
| IMPORTED_LINK_INTERFACE_LANGUAGES "C" | ||
| IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}") | ||
|
|
||
| endif() |
Oops, something went wrong.