diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b4fea8..6d0ed29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ nx_configure() set(csio_VERSION_MAJOR 0) set(csio_VERSION_MINOR 1) -set(csio_VERSION_PATCH 2) +set(csio_VERSION_PATCH 3) # configuration header set(TEST_SAMPLES_DIR "${PROJECT_SOURCE_DIR}/test/samples/") set(TEST_TMP_DIR "/tmp") diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake deleted file mode 100644 index 83f7188..0000000 --- a/cmake/Modules/FindGlog.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# Find Snappy -# Merder Kim -# -# input: -# Glog_ROOT -# Glog_USE_STATIC_LIBS -# -# output: -# Glog_FOUND -# Glog_INCLUDE_DIR -# Glog_LIBRARIES -# - -if(Glog_INCLUDE_DIR AND Glog_LIBRARIES) - set(Glog_FIND_QUITELY TRUE) # cached -endif(Glog_INCLUDE_DIR AND Glog_LIBRARIES) - -if(NOT DEFINED Glog_ROOT) - set(Glog_ROOT /usr /usr/local $ENV{Glog_ROOT}) -endif(NOT DEFINED Glog_ROOT) - -find_path(Glog_INCLUDE_DIR glog/logging.h - PATHS ${Glog_ROOT} - PATH_SUFFIXES include -) - -if(Glog_USE_STATIC_LIBS) - set( _glog_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - if(WIN32) - set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) - else() - set(CMAKE_FIND_LIBRARY_SUFFIXES .a ) - endif() -endif() - -find_library(Glog_LIBRARIES - NAMES glog - PATHS ${Glog_ROOT} - PATH_SUFFIXES lib -) -mark_as_advanced(Glog_INCLUDE_DIR Glog_LIBRARIES) - -# Restore the original find library ordering -if( Glog_USE_STATIC_LIBS ) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_glog_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -endif() - -include("${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake") -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glog DEFAULT_MSG Glog_INCLUDE_DIR Glog_LIBRARIES) - - diff --git a/conanfile.py b/conanfile.py index 2815df7..dcfbf1c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -2,13 +2,20 @@ class SnappyStreamConan(ConanFile): name = "csio" - version = "0.1.2" + version = "0.1.3" requires = "" settings = "os", "compiler", "build_type", "arch" options = {"shared": [True, False], "dzip": [True, False]} default_options = "shared=False", "dzip=False", "zlib:shared=False", "libzmq:shared=False" generators = "cmake" - exports = "*" + exports = ("include/*.h", + "src/*.h", "src/*.c", + "src/*.hpp", "src/*.cpp", + "src/csio_config.cfg", + "cmake/ext/nx_utils.cmake", + "CMakeLists.txt", + "README.markdown", + "LICENSE") def requirements(self): if self.options.dzip: diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 7a48ff9..d4ff662 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -6,7 +6,7 @@ class SnappyStreamTestConan(ConanFile): settings = "os", "compiler", "build_type", "arch" - requires = "csio/0.1.2@%s/%s" % (username, channel) + requires = "csio/0.1.3@%s/%s" % (username, channel) default_options = "csio:dzip=True" generators = "cmake"