Skip to content

Commit

Permalink
pagmo2: transitive_headers=True
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Nov 4, 2023
1 parent 6feeb3d commit 5e8c7c3
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions recipes/pagmo2/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("boost/1.83.0")
self.requires("boost/1.83.0", transitive_headers=True)
self.requires("onetbb/2021.10.0")
if self.options.with_eigen:
self.requires("eigen/3.4.0")
self.requires("eigen/3.4.0", transitive_headers=True)
if self.options.with_nlopt:
self.requires("nlopt/2.7.1")
self.requires("nlopt/2.7.1", transitive_headers=True, transitive_libs=True)

@property
def _required_boost_components(self):
Expand Down Expand Up @@ -116,12 +116,8 @@ def generate(self):

def _patch_sources(self):
# do not force MT runtime for static lib
replace_in_file(
self,
os.path.join(self.source_folder, "CMakeLists.txt"),
"if(YACMA_COMPILER_IS_MSVC AND PAGMO_BUILD_STATIC_LIBRARY)",
"if(0)",
)
replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
"if(YACMA_COMPILER_IS_MSVC AND PAGMO_BUILD_STATIC_LIBRARY)", "if(0)")
# No warnings as errors
yacma_cmake = os.path.join(self.source_folder, "cmake_modules", "yacma", "YACMACompilerLinkerSettings.cmake")
replace_in_file(self, yacma_cmake, 'list(APPEND _YACMA_CXX_FLAGS_DEBUG "-Werror")', "")
Expand Down

0 comments on commit 5e8c7c3

Please sign in to comment.