Skip to content

Commit

Permalink
libpressio version 0.6.1
Browse files Browse the repository at this point in the history
Bug Fix: Previously libpressio used the wrong directory for a system
installed SZ.  Now it uses the properly name-spaced directory
  • Loading branch information
robertu94 committed Aug 6, 2019
1 parent 903057e commit 4404e97
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
12 changes: 7 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
project(libpressio VERSION "0.6.0" LANGUAGES CXX C)
project(libpressio VERSION "0.6.1" LANGUAGES CXX C)

enable_testing()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

include(GNUInstallDirs)
find_package(ZFP)
find_package(PkgConfig)
pkg_search_module(SZ IMPORTED_TARGET GLOBAL sz)
find_package(ZFP REQUIRED)
find_package(SZ REQUIRED)
find_package(ZLIB REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_search_module(ZSTD IMPORTED_TARGET GLOBAL libzstd)


set(LIBPRESSIO_FEATURES "sz zfp")
Expand Down Expand Up @@ -71,7 +73,7 @@ target_include_directories(libpressio
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include
)
target_compile_options(libpressio PRIVATE $<$<CONFIG:Debug>: -Wall -Werror -Wextra -Wpedantic>)
target_link_libraries(libpressio PUBLIC zfp::zfp PkgConfig::SZ)
target_link_libraries(libpressio PUBLIC zfp::zfp SZ)
set_target_properties(libpressio PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)

install(TARGETS libpressio EXPORT LibPressioConfig
Expand Down
2 changes: 1 addition & 1 deletion include/libpressio_ext/compressors/sz.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** \file
* \brief Includes definitions needed to use the SZ pressio compressor
*/
#include <sz.h>
#include <sz/sz.h>
2 changes: 1 addition & 1 deletion src/plugins/compressors/sz_plugin.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <memory>
#include <sstream>

#include <sz.h>
#include <sz/sz.h>

#include "libpressio_ext/cpp/compressor.h"
#include "pressio_data.h"
Expand Down
2 changes: 1 addition & 1 deletion test/test_sz_plugin.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <sz.h>
#include <sz/sz.h>
#include "gtest/gtest.h"
#include "gmock/gmock.h"

Expand Down

0 comments on commit 4404e97

Please sign in to comment.