Skip to content

Commit

Permalink
no -Werror
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceIm committed Jan 26, 2021
1 parent 8159dcd commit 5f1d867
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions recipes/octomap/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,12 @@ def _patch_sources(self):
tools.replace_in_file(os.path.join(self._source_subfolder, "octomap", "CMakeLists.txt"),
"SET( BASE_DIR ${CMAKE_SOURCE_DIR} )",
"SET( BASE_DIR ${CMAKE_BINARY_DIR} )")
compiler_settings = os.path.join(self._source_subfolder, "octomap", "CMakeModules", "CompilerSettings.cmake")
# Do not force PIC
tools.replace_in_file(os.path.join(self._source_subfolder, "octomap", "CMakeModules", "CompilerSettings.cmake"),
"ADD_DEFINITIONS(-fPIC)", "")
tools.replace_in_file(compiler_settings, "ADD_DEFINITIONS(-fPIC)", "")
# No -Werror
if tools.Version(self.version) >= "1.9.6":
tools.replace_in_file(compiler_settings, "-Werror", "")

def package(self):
self.copy("LICENSE.txt", dst="licenses", src=os.path.join(self._source_subfolder, "octomap"))
Expand Down

0 comments on commit 5f1d867

Please sign in to comment.