Fix auto_ptr compilation error

qgis · Jul 7, 2021 · 4f384f4 · 4f384f4
1 parent 4b52b7b
commit 4f384f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
@@ -455,14 +455,6 @@ 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()
-if (MSVC)
-  target_compile_definitions(qgis_analysis PUBLIC _HAS_AUTO_PTR_ETC=1)
-endif()
-
 target_include_directories(qgis_analysis PUBLIC
   ${CMAKE_SOURCE_DIR}/src/analysis
   ${CMAKE_SOURCE_DIR}/src/analysis/georeferencing

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1863,6 +1863,14 @@ add_library(qgis_core ${LIBRARY_TYPE} ${QGIS_CORE_SRCS} ${QGIS_CORE_HDRS} ${QGIS
 # require c++17
 target_compile_features(qgis_core PRIVATE cxx_std_17)
 
+# Exiv still uses std::auto_ptr
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  target_compile_definitions(qgis_core PUBLIC _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
+endif()
+if (MSVC)
+  target_compile_definitions(qgis_core PUBLIC _HAS_AUTO_PTR_ETC=1)
+endif()
+
 target_include_directories(qgis_core SYSTEM PUBLIC
   ${${QT_VERSION_BASE}Core_INCLUDE_DIRS}
   ${${QT_VERSION_BASE}Gui_INCLUDE_DIRS}