Alternate approach

qgis · Feb 25, 2021 · 1dd2ca9 · 1dd2ca9
1 parent c087ffa
commit 1dd2ca9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -446,6 +446,11 @@ add_library(qgis_analysis ${LIBRARY_TYPE} ${QGIS_ANALYSIS_SRCS} ${QGIS_ANALYSIS_
 # require c++17
 target_compile_features(qgis_analysis PRIVATE cxx_std_17)
 
+# Exiv still uses std::auto_ptr
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  target_compile_definitions(qgis_analysis PUBLIC _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
+endif()
+
 target_include_directories(qgis_analysis PUBLIC
   ${CMAKE_SOURCE_DIR}/src/analysis
   ${CMAKE_SOURCE_DIR}/src/analysis/georeferencing

diff --git a/src/analysis/raster/qgsexiftools.cpp b/src/analysis/raster/qgsexiftools.cpp
@@ -16,8 +16,6 @@
 #include "qgsexiftools.h"
 #include "qgspoint.h"
 
-// needed because released versions of eviv (<=0.27) make use of auto_ptr in the public header
-#define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
 #include <exiv2/exiv2.hpp>
 
 #include <QRegularExpression>