diff options
| author | Todor Prokopov <koprok@users.noreply.github.com> | 2020-02-12 03:30:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 17:30:03 -0800 |
| commit | f478be7479f4a418d46c34156bb34ae4f87656af (patch) | |
| tree | aebf211e460ef405e7e5cd6787d5732b9dd4bc62 /ports/tmxparser | |
| parent | 5f12ffae8d6444383ed6d88da08ee32876726ebc (diff) | |
| download | vcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.tar.gz vcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.zip | |
[many ports] Support building with MinGW toolchain (#8940)
* Some package fixes necessary to build with MinGW toolchain
* [libraqm] Fix build error caused by trying to write to source directory
* [tmxparser] Fix build failure when tmx port is intalled before tmxparser port
System include path was added first on compiler command line. This leads to
build failure when there is a tmx.h header file in system include path.
* [qt5-base][angle] Trigger CI rebuild
* [kd-soap] Fix build error
* Update ci.baseline
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/tmxparser')
| -rw-r--r-- | ports/tmxparser/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tmxparser/fix_include_paths.patch | 22 | ||||
| -rw-r--r-- | ports/tmxparser/portfile.cmake | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/ports/tmxparser/CONTROL b/ports/tmxparser/CONTROL index 44954e36e..52288b2db 100644 --- a/ports/tmxparser/CONTROL +++ b/ports/tmxparser/CONTROL @@ -1,4 +1,4 @@ Source: tmxparser
-Version: 2.1.0-3
+Version: 2.1.0-4
Description: C++11 library for parsing the maps generated by the Map Editor called Tiled.
Build-Depends: zlib, tinyxml2
diff --git a/ports/tmxparser/fix_include_paths.patch b/ports/tmxparser/fix_include_paths.patch new file mode 100644 index 000000000..fedcb43bc --- /dev/null +++ b/ports/tmxparser/fix_include_paths.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d06cb4..593bbfd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,8 @@ endif (NOT USE_MINIZ) + + set(EXAMPLE_CFLAGS "-std=c++11 -pedantic -Werror -Wall -g") + #include_directories("${PROJECT_SOURCE_DIR}/include") ++include_directories("${PROJECT_BINARY_DIR}") ++include_directories("${PROJECT_SOURCE_DIR}/src") + + add_library(tmxparser_static STATIC ${SOURCES} ${HEADERS}) + set_target_properties(tmxparser_static PROPERTIES +@@ -67,8 +69,6 @@ add_executable(run_tests test/test.cpp) + set_target_properties(run_tests PROPERTIES + COMPILE_FLAGS ${EXAMPLE_CFLAGS}) + target_link_libraries(run_tests tmxparser ${TINYXML2_LIBRARIES}) +-include_directories("${PROJECT_BINARY_DIR}") +-include_directories("${PROJECT_SOURCE_DIR}/src") + + install(FILES ${HEADERS} DESTINATION include/tmxparser) + install(TARGETS tmxparser tmxparser_static DESTINATION lib) diff --git a/ports/tmxparser/portfile.cmake b/ports/tmxparser/portfile.cmake index 024d14d09..1f1b9e286 100644 --- a/ports/tmxparser/portfile.cmake +++ b/ports/tmxparser/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v2.1.0
HEAD_REF master
SHA512 011cce3bb98057f8e2a0a82863fedb7c4b9e41324d5cfa6daade4d000c3f6c8c157da7b153f7f2564ecdefe8019fc8446c9b1b8a675be04329b04a0891ee1c27
+ PATCHES
+ fix_include_paths.patch
)
vcpkg_configure_cmake(
|