Skip to content

Commit

Permalink
version 0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
hoxnox committed Jun 22, 2016
1 parent a094e2b commit b146168
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 55 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
51 changes: 0 additions & 51 deletions cmake/Modules/FindGlog.cmake

This file was deleted.

11 changes: 9 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit b146168

Please sign in to comment.