diff --git a/recipes/nsync/all/CMakeLists.txt b/recipes/nsync/all/CMakeLists.txt index a69305eb3971f9..881b1cb39250b4 100644 --- a/recipes/nsync/all/CMakeLists.txt +++ b/recipes/nsync/all/CMakeLists.txt @@ -1,7 +1,9 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.4) project(cmake_wrapper) include(conanbuildinfo.cmake) conan_basic_setup() +set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) + add_subdirectory(source_subfolder) diff --git a/recipes/nsync/all/conanfile.py b/recipes/nsync/all/conanfile.py index 2086972f0ce282..c68f19dfbcaa7d 100644 --- a/recipes/nsync/all/conanfile.py +++ b/recipes/nsync/all/conanfile.py @@ -68,7 +68,7 @@ def package(self): cmake = self._configure_cmake() cmake.install() if self.settings.os == "Windows" and self.options.shared: - self.copy("bin/*.dll", dst='lib', src=self._build_subfolder) + self.copy("bin/*.dll", dst="bin", keep_path=False) def package_info(self): self.cpp_info.filenames["cmake_find_package"] = "nsync" @@ -91,5 +91,5 @@ def _def_compoment(self, name, lib=None): if self.settings.os in ["Linux", "FreeBSD"]: component.system_libs = ["pthread"] - if self.settings.os == "Windows" and self.options.shared: - component.libdirs = ["lib"] + if self.settings.os == "Windows": + component.libdirs = ["lib", "bin"]