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

Set CMAKE_BUILD_TYPE for LZ4/Zlib and Zstd #1034

Merged
merged 1 commit into from
Oct 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

## Improvements

* Set LZ4, Zlib and Zstd compressors to build in release mode. [#1034](https://github.com/TileDB-Inc/TileDB/pull/1034)

# TileDB v1.4.0 Release Notes

The 1.4.0 release brings two new major features, attribute filter lists and at-rest array encryption, along with bugfixes and performance improvements.
Expand Down
3 changes: 2 additions & 1 deletion cmake/Modules/FindLZ4_EP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ if (NOT LZ4_FOUND)
-DLZ4_POSITION_INDEPENDENT_LIB=ON
-DBUILD_SHARED_LIBS=OFF
-DBUILD_STATIC_LIBS=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX}
${LZ4_CMAKE_DIR}
UPDATE_COMMAND ""
Expand All @@ -117,4 +118,4 @@ endif()
# If we built a static EP, install it if required.
if (LZ4_STATIC_EP_FOUND AND TILEDB_INSTALL_STATIC_DEPS)
install_target_libs(LZ4::LZ4)
endif()
endif()
4 changes: 2 additions & 2 deletions cmake/Modules/FindZlib_EP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if (NOT ZLIB_FOUND)
URL "http://prdownloads.sourceforge.net/libpng/zlib1211.zip?download"
URL_HASH SHA1=bccd93ad3cee39c3d08eee68d45b3e11910299f2
DOWNLOAD_NAME "zlib1211.zip"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=Release
UPDATE_COMMAND ""
LOG_DOWNLOAD TRUE
LOG_CONFIGURE TRUE
Expand Down Expand Up @@ -102,4 +102,4 @@ endif()
# If we built a static EP, install it if required.
if (TILEDB_ZLIB_EP_BUILT AND TILEDB_INSTALL_STATIC_DEPS)
install_target_libs(Zlib::Zlib)
endif()
endif()
3 changes: 2 additions & 1 deletion cmake/Modules/FindZstd_EP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ if (NOT ZSTD_FOUND)
${CMAKE_COMMAND}
${ARCH_SPEC}
${LDFLAGS_DEF}
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX}
${TILEDB_EP_BASE}/src/ep_zstd/build/cmake
UPDATE_COMMAND ""
Expand All @@ -118,4 +119,4 @@ endif()
# If we built a static EP, install it if required.
if (ZSTD_STATIC_EP_FOUND AND TILEDB_INSTALL_STATIC_DEPS)
install_target_libs(Zstd::Zstd)
endif()
endif()