fix msvc build again (take II)

qgis · Sep 4, 2022 · b5e6078 · b5e6078
1 parent 125294a
commit b5e6078
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -436,9 +436,6 @@ if(WITH_CORE)
     endif()
     find_package(PDAL REQUIRED) # PDAL provider
     set(HAVE_PDAL_QGIS TRUE)  # used in qgisconfig.h. note -- we can't use HAVE_PDAL here as the grass public headers redefine this!
-    if(MSVC)
-       add_definitions(-DWIN32_LEAN_AND_MEAN)
-    endif()
   endif()
 
   #############################################################

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -468,6 +468,9 @@ endif()
 
 if (WITH_PDAL)
   include_directories(SYSTEM ${PDAL_INCLUDE_DIR})
+  if(MSVC)
+    add_definitions(-DWIN32_LEAN_AND_MEAN)
+  endif()
 endif()
 
 if(ENABLE_MODELTEST)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1971,6 +1971,9 @@ if (WITH_PDAL)
   include_directories(SYSTEM
     ${PDAL_INCLUDE_DIR}
   )
+  if(MSVC)
+    add_definitions(-DWIN32_LEAN_AND_MEAN)
+  endif()
 endif()
 
 if (HAVE_OPENCL)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -1515,6 +1515,13 @@ if (BUILD_WITH_QT6)
   )
 endif()
 
+if (WITH_PDAL)
+  include_directories(SYSTEM ${PDAL_INCLUDE_DIR})
+  if(MSVC)
+    add_definitions(-DWIN32_LEAN_AND_MEAN)
+  endif()
+endif()
+
 target_include_directories(qgis_gui PUBLIC
   ${CMAKE_SOURCE_DIR}/src/gui
   ${CMAKE_SOURCE_DIR}/src/gui/annotations

diff --git a/src/providers/pdal/CMakeLists.txt b/src/providers/pdal/CMakeLists.txt
@@ -1,6 +1,10 @@
 ########################################################
 # Files
 
+if(MSVC)
+  add_definitions(-DWIN32_LEAN_AND_MEAN)
+endif(MSVC)
+
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)