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/libraqm | |
| 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/libraqm')
| -rw-r--r-- | ports/libraqm/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | ports/libraqm/CONTROL | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/libraqm/CMakeLists.txt b/ports/libraqm/CMakeLists.txt index b1a88b268..22f4e59d9 100644 --- a/ports/libraqm/CMakeLists.txt +++ b/ports/libraqm/CMakeLists.txt @@ -13,10 +13,11 @@ find_path(HARFBUZZ_INCLUDE_DIRS PATH_SUFFIXES harfbuzz)
find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h)
+configure_file(src/raqm-version.h.in src/raqm-version.h)
-add_library(raqm ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.c ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h)
+add_library(raqm src/raqm.c src/raqm.h src/raqm-version.h)
+target_include_directories(raqm PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src)
target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS})
target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS})
target_include_directories(raqm SYSTEM PUBLIC ${HARFBUZZ_INCLUDE_DIRS})
@@ -34,4 +35,4 @@ install(TARGETS raqm set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
set(RAQM_LIBRARY raqm)
set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY})
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h ${CMAKE_CURRENT_BINARY_DIR}/src/raqm-version.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/libraqm/CONTROL b/ports/libraqm/CONTROL index f637fac3a..d768af76f 100644 --- a/ports/libraqm/CONTROL +++ b/ports/libraqm/CONTROL @@ -1,4 +1,4 @@ Source: libraqm
-Version: 0.7.0
+Version: 0.7.0-1
Description: A library for complex text layout
Build-Depends: freetype, harfbuzz, fribidi
\ No newline at end of file |