Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix msvc build after untwine update #60677

Merged
merged 1 commit into from
Feb 20, 2025
Merged

fix msvc build after untwine update #60677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/untwine/untwine/windows/mapfile.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <Windows.h>
#include <windows.h>
#include <io.h>
#include <fcntl.h>

Expand Down
7 changes: 7 additions & 0 deletions src/analysis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,13 @@ if (WITH_PDAL AND PDAL_2_5_OR_HIGHER)
include_directories(
${CMAKE_SOURCE_DIR}/external/untwine/api
)

IF(MSVC)
set_source_files_properties(
${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
PROPERTIES COMPILE_FLAGS "/DUNICODE"
)
endif()
endif()

include_directories(SYSTEM ${SPATIALINDEX_INCLUDE_DIR})
Expand Down
7 changes: 7 additions & 0 deletions src/providers/pdal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ set(PDAL_SRCS
${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
)

IF(MSVC)
set_source_files_properties(
${CMAKE_SOURCE_DIR}/external/untwine/api/QgisUntwine.cpp
PROPERTIES COMPILE_FLAGS "/DUNICODE"
)
endif()

set(PDAL_HDRS
qgspdalprovider.h
qgspdalindexingtask.h
Expand Down
Loading