Skip to content

Commit

Permalink
Merge pull request #1942 from Minimonium/feature/cppzmq-fix-windows-c…
Browse files Browse the repository at this point in the history
…make-build
  • Loading branch information
uilianries authored Jun 22, 2020
2 parents ac0f772 + dc91065 commit df1cf5f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 3 additions & 1 deletion recipes/cppzmq/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class CppZmqConan(ConanFile):
exports_sources = "CMakeLists.txt", "patches/**"
generators = "cmake", "cmake_find_package"
requires = "zeromq/4.3.2"
settings = "os", "compiler", "build_type", "arch"

_cmake = None

Expand Down Expand Up @@ -41,7 +42,8 @@ def build(self):
cmake.build()

def package(self):
self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder)
self.copy(pattern="LICENSE", dst="licenses",
src=self._source_subfolder)
cmake = self._configure_cmake()
cmake.install()

Expand Down
2 changes: 0 additions & 2 deletions recipes/cppzmq/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 2.8.12)
project(test_package)

set(CMAKE_VERBOSE_MAKEFILE TRUE)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()

Expand Down

0 comments on commit df1cf5f

Please sign in to comment.