fixes for compiling with PDAL/untwine with MSVC/Windows #42904
Conversation
|
Cc: @jef-n |
| @@ -513,7 +513,7 @@ target_link_libraries(qgis_app | |||
| libdxfrw | |||
| ) | |||
|
|
|||
| target_compile_definitions(qgis_app PRIVATE "-DQT_NO_FOREACH") | |||
| target_compile_definitions(qgis_app PRIVATE "-DQT_NO_FOREACH -DWIN32_LEAN_AND_MEAN") | |||
| @@ -181,6 +181,8 @@ class QgsNetworkLoggerWidgetFactory; | |||
|
|
|||
| #ifdef Q_OS_WIN | |||
| #include <windows.h> | |||
| // because of WIN32_LEAN_AND_MEAN we need to include this explicitly | |||
| #include <shellapi.h> | |||
| @@ -111,6 +111,8 @@ set_target_properties(untwine PROPERTIES | |||
| RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIBEXEC_SUBDIR} | |||
| ) | |||
|
|
|||
| target_compile_definitions(untwine PRIVATE WIN32_LEAN_AND_MEAN) | |||
There was a problem hiding this comment.
already in line 5.
IOW c5ea4b2 should already cover this fully.
|
Sorry! Somehow I missed that this had gone into master... While I have your attention, how do you feel about hobuinc/untwine#59 and hobuinc/untwine@c7f94c1 which fix compilation for VC 2017 (needed for compatibility with Python see https://wiki.python.org/moin/WindowsCompilers ) |
Not sure - I use VC2019 for master and it builds fine as is - if it also builds with those changes - fine with me. I just didn't check yet. |
|
Thanks @jef-n ! |
np |
Description
Currently there are some problems compiling PDAL and untwine etc on Windows. Firstly, PDAL pulls in
winsock2.hand parts of untwine and QGIS pull inwindows.hbefore including PDAL (which by default includeswinsock.h). This leads to compile errors due to the differently defined symbols inwinsock.handwinsock2.h(see https://stackoverflow.com/questions/9153911/is-there-a-difference-between-winsock-h-and-winsock2-h/9168850).One solution is to always ensure that
winsock2.his included beforewindows.h. The other (less invasive) solution is to define theWIN32_LEAN_AND_MEANsymbol during the compile which stopswindows.hincludingwinsock.h(and a few other optional headers). This is what standalone untwine does (https://github.com/hobu/untwine/blob/main/cmake/win32_compiler_options.cmake#L9) and this is what I've gone for here.Only problem was that qgisapp.cpp uses
ShellExecute()fromshellapi.hwhich isn't included withwindows.hdue toWIN32_LEAN_AND_MEANso I've had to add this include in.There have also been a few recent (source) fixes to untwine for windows (hobuinc/untwine@c7f94c1 hobuinc/untwine#59 hobuinc/untwine#57). Are changes to untwine pulled in automatically, or should these changes be added to this PR?
xref: conda-forge/qgis-feedstock#178
cc: @SrNetoChan @hobu