7
0
mirror of https://github.com/Minres/conan-recipes.git synced 2025-07-01 15:33:27 +02:00

Updated versions

This commit is contained in:
2019-06-15 22:31:04 +02:00
parent a7a465e69c
commit 8f776c8557
13 changed files with 91 additions and 67 deletions

View File

@ -12,7 +12,7 @@ class SeasocksConan(ConanFile):
default_options = "shared=True"
generators = "cmake"
exports_sources = "src/main/c/*"
reuires = "zlib/1.2.11@conan/stable"
#requires = "zlib/1.2.11@conan/stable"
def source(self):
@ -23,10 +23,11 @@ class SeasocksConan(ConanFile):
tools.replace_in_file("seasocks/CMakeLists.txt", "project(Seasocks VERSION 1.3.2)", '''project(Seasocks VERSION 1.3.2)
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()''')
tools.replace_in_file("seasocks/src/CMakeLists.txt", 'add_subdirectory("app/c")', '#add_subdirectory("app/c")')
def build(self):
cmake = CMake(self, parallel=True)
cmake.configure(source_folder="seasocks")
cmake.configure(source_folder="seasocks", args=["-DCMAKE_INSTALL_LIBDIR=lib"])
cmake.build()
cmake.install()

View File

@ -6,7 +6,7 @@ class SeasocksTestConan(ConanFile):
options = {"shared": [True, False]}
default_options = "shared=True"
generators = "cmake"
build_requires = "Catch/1.9.2@uilianries/stable"
build_requires = "Catch/1.9.6@uilianries/stable"
def configure(self):
self.options["Seasocks"].shared = self.options.shared