mirror of
				https://github.com/Minres/conan-recipes.git
				synced 2025-10-30 21:59:36 +00:00 
			
		
		
		
	Updated conanfiles to work with release 1.0 of conan.io.
This commit is contained in:
		| @@ -26,8 +26,9 @@ conan_basic_setup()''') | ||||
|  | ||||
|     def build(self): | ||||
|         cmake = CMake(self, parallel=True) | ||||
|         self.run('cmake seasocks %s' % cmake.command_line) | ||||
|         self.run("cmake --build . --target install %s" % cmake.build_config) | ||||
|         cmake.configure(source_folder="seasocks") | ||||
|         cmake.build() | ||||
|         cmake.install() | ||||
|  | ||||
|     #def package(self): | ||||
|         # nothing to do here now | ||||
|   | ||||
| @@ -3,13 +3,17 @@ import os | ||||
|  | ||||
| class SeasocksTestConan(ConanFile): | ||||
|     settings = "os", "compiler", "build_type", "arch" | ||||
|     options = {"shared": [True, False]} | ||||
|     default_options = "shared=True" | ||||
|     generators = "cmake" | ||||
|     build_requires = "Catch/1.9.2@uilianries/stable" | ||||
|  | ||||
|     def configure(self): | ||||
|         self.options["Seasocks"].shared = self.options.shared | ||||
|      | ||||
|     def build(self): | ||||
|         cmake = CMake(self) | ||||
|         # Current dir is "test_package/build/<build_id>" and CMakeLists.txt is in "test_package" | ||||
|         cmake.configure(source_dir=self.conanfile_directory, build_dir="./") | ||||
|         cmake.configure() | ||||
|         cmake.build() | ||||
|  | ||||
|     def imports(self): | ||||
|   | ||||
		Reference in New Issue
	
	Block a user