Skip to content

Commit

Permalink
Fix ignoring CMAKE_CXX_FLAGS in simdjson 0.2.1
Browse files Browse the repository at this point in the history
Fixed in upstream commit 9442c9e1, not released yet
  • Loading branch information
theirix committed Jan 19, 2020
1 parent 8dc73b1 commit e8157ff
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions recipes/simdjson/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ def source(self):
extracted_dir = self.name + "-" + self.version
os.rename(extracted_dir, self._source_subfolder)

# In version 0.2.1 CMAKE_CXX_FLAGS are ignored
tools.replace_in_file(os.path.join(self._source_subfolder, 'tools', 'cmake', 'FindOptions.cmake'),
'set(CMAKE_CXX_FLAGS "${CXXSTD_FLAGS}',
'set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXXSTD_FLAGS}',
strict=False)

def _configure_cmake(self):
cmake = CMake(self)
cmake.definitions['SIMDJSON_BUILD_STATIC'] = not self.options.shared
Expand Down

0 comments on commit e8157ff

Please sign in to comment.