From e8157ff538bb0cb064141dc2210ed92a8c1482d3 Mon Sep 17 00:00:00 2001 From: theirix Date: Sun, 19 Jan 2020 22:06:06 +0300 Subject: [PATCH] Fix ignoring CMAKE_CXX_FLAGS in simdjson 0.2.1 Fixed in upstream commit 9442c9e1, not released yet --- recipes/simdjson/all/conanfile.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes/simdjson/all/conanfile.py b/recipes/simdjson/all/conanfile.py index d810c05886b06..dcefebd450a9e 100644 --- a/recipes/simdjson/all/conanfile.py +++ b/recipes/simdjson/all/conanfile.py @@ -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