fix untwine compilation on macos (#41939)

qgis · Mar 1, 2021 · a0b858b · a0b858b
1 parent 364959a
commit a0b858b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -141,13 +141,12 @@ jobs:
           mkdir -p ${BUILD_DIR}
           cd ${BUILD_DIR}
 
-          # FIXME: PDAL disable because of #39971
           PATH=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage/bin:$PATH \
           cmake -DQGIS_MAC_DEPS_DIR=/opt/QGIS/qgis-deps-${QGIS_DEPS_VERSION}/stage \
                -DCMAKE_PREFIX_PATH=/opt/Qt/${QT_VERSION}/clang_64 \
                -DWITH_BINDINGS=TRUE \
                -DWITH_3D=TRUE \
-               -DWITH_PDAL=FALSE \
+               -DWITH_PDAL=TRUE \
                -DWITH_EPT=TRUE \
                ../QGIS
 

diff --git a/src/providers/pdal/CMakeLists.txt b/src/providers/pdal/CMakeLists.txt
@@ -102,6 +102,7 @@ include_directories(SYSTEM
 )
 
 add_executable(untwine ${UNTWINE_SRCS} ${UNTWINE_HDRS})
+target_compile_features(untwine PRIVATE cxx_std_17)
 
 set_target_properties(untwine PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIBEXEC_SUBDIR}
@@ -115,8 +116,7 @@ target_include_directories(untwine PRIVATE ${UNTWINE_INCLUDE_DIRS})
 
 add_library (pdalprovider MODULE ${PDAL_SRCS} ${PDAL_HDRS} ${PDAL_GUI_SRCS} ${PDAL_GUI_HDRS})
 
-# require c++14 only -- untwine is not compatible with c++17
-target_compile_features(pdalprovider PRIVATE cxx_std_14)
+target_compile_features(pdalprovider PRIVATE cxx_std_17)
 
 target_link_libraries (pdalprovider
   qgis_core