mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 04:19:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge https://github.com/Microsoft/vcpkg

Browse Source
This commit is contained in:
atkawa7 2017-06-14 08:29:12 -07:00
commit ce5ad1ffe1
155 changed files with 4575 additions and 744 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,5 +1,5 @@
# Vcpkg <a href="#">![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5261/badge)</a>
## Overview
Vcpkg helps you get C and C++ libraries on Windows. This tool and ecosystem are currently in a preview state; your involvement is vital to its success.
@ -31,6 +31,8 @@ For CMake projects, simply include our toolchain file. See our [using a package]
## Examples
See the [documentation](docs/index.md) for specific walkthroughs, including [using a package](docs/examples/using-sqlite.md) and [adding a new package](docs/examples/packaging-zlib.md).
Our docs are now also available online at ReadTheDocs: <https://vcpkg.readthedocs.io/>!
See a 4 minute [video demo](https://www.youtube.com/watch?v=y41WFKbQFTw).
## Contributing

1
docs/index.md
View File

@ -13,6 +13,7 @@ Vcpkg helps you get C and C++ libraries on Windows. This tool and ecosystem are
### User Help
- [Integration with build systems](users/integration.md)
- [Triplet files](users/triplets.md)
### Maintainer help

18
docs/maintainers/control-files.md
View File

@ -1,16 +1,16 @@
## `CONTROL` files
Each port has some static metadata in the form of a `CONTROL` file. This file uses the same rough syntax as and a subset of the fields from [the Debian `control` format][debian].
# CONTROL files
Each port has some static metadata in the form of a `CONTROL` file. This file uses the same syntax and a subset of the fields from [the Debian `control` format][debian].
Fields are case-sensitive.
Field names are case-sensitive.
[debian]: https://www.debian.org/doc/debian-policy/ch-controlfields.html
### Recognized fields
## Recognized fields
#### Source
### Source
The name of the port.
#### Version
### Version
The port version.
This field should be an alphanumeric string which may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bitstrings and are only evaluated for equality.
@ -22,15 +22,15 @@ Example:
Version: 1.0.5-2
```
#### Description
### Description
A description of the library
The first sentence of the description should concisely describe the purpose and contents of the library. Then, a larger description including the library's "proper name" should follow.
#### Maintainer
### Maintainer
Reserved for future use.
#### Build-Depends
### Build-Depends
The list of dependencies required to build and use this library.
Example:

38
docs/users/integration.md
View File

@ -5,11 +5,14 @@ Vcpkg offers many ways to integrate into your build so you can do what's right f
- [`integrate` command](#integrate)
- [`export` command](#export)
Each integration style has heuristics to deduce the correct [triplet][]. This can be overridden using [a common method](#triplet-selection) based on your buildsystem.
<a name="integrate"></a>
### Integrate Command
These link your project(s) to a specific copy of Vcpkg on your machine so any updates or new package installations will be instantly available for the next build of your project.
<a name="user-wide-msbuild"></a>
#### User-wide for MSBuild (Recommended for Open Source MSBuild projects)
```no-highlight
vcpkg integrate install
@ -82,4 +85,37 @@ Each of these have the same layout, which mimics the layout of a full vcpkg:
Additionally, NuGet packages will contain a `build\native\vcpkg.targets` that integrates with MSBuild projects.
Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples.
Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples.
<a name="triplet-selection"></a>
### Triplet selection
Every integration mechanism besides manually adding the folders will deduce a [triplet][] for your project as one of:
- x86-windows
- x64-windows
- x86-uwp
- x64-uwp
- arm-uwp
#### With MSBuild
You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher:
> *Shortcut: Ctrl+Q "build and run"*
>
> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity
To override the automatically chosen [triplet][], you can specify the MSBuild property `VcpkgTriplet` in your `.vcxproj`. We recommend adding this to the `Globals` PropertyGroup.
```xml
<PropertyGroup Label="Globals">
<!-- .... -->
<VcpkgTriplet Condition="'$(Configuration)'=='Win32'">x86-windows-static</VcpkgTriplet>
<VcpkgTriplet Condition="'$(Configuration)'=='x64'">x64-windows-static</VcpkgTriplet>
</PropertyGroup>
```
#### With CMake
Simply set `VCPKG_TARGET_TRIPLET` on the configure line.
```no-highlight
cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=...
```
[triplet]: triplets.md

56
docs/users/triplets.md Normal file
View File

@ -0,0 +1,56 @@
# Triplet files
Triplet is a standard term used in cross compiling as a way to completely capture the target environment (cpu, os, compiler, runtime, etc) in a single convenient name.
In Vcpkg, we use triplets to describe self-consistent builds of library sets. This means every library will be built using the same target cpu, OS, and compiler toolchain, but also CRT linkage and preferred library type.
We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily add your own by creating a new file in the `triplets\` directory. The new triplet will immediately be available for use in commands, such as `vcpkg install boost:x86-windows-custom`.
To change the triplet used by your project, such as to enable static linking, see our [Integration Document](integration.md#triplet-selection).
## Variables
### VCPKG_TARGET_ARCHITECTURE
Specifies the target machine architecture.
Valid options are `x86`, `x64`, and `arm`.
### VCPKG_CRT_LINKAGE
Specifies the desired MSVCRT linkage.
Valid options are `dynamic` and `static`.
### VCPKG_LIBRARY_LINKAGE
Specifies the preferred library linkage.
Valid options are `dynamic` and `static`. Note that libraries can ignore this setting if they do not support the preferred linkage type.
### VCPKG_CMAKE_SYSTEM_NAME
Specifies the target platform.
Valid options are `WindowsStore` or empty. Empty corresponds to Windows Desktop and `WindowsStore` corresponds to UWP.
When setting this variable to `WindowsStore`, you must also set `VCPKG_CMAKE_SYSTEM_VERSION` to `10.0`.
### VCPKG_PLATFORM_TOOLSET
Specifies the C/C++ compiler toolchain to use.
This can be set to `v141`, `v140`, or left blank. If left blank, we select the latest compiler toolset available on your machine.
## Per-port customization
The CMake Macro `PORT` will be set when interpreting the triplet file and can be used to change settings (such as `VCPKG_LIBRARY_LINKAGE`) on a per-port basis.
Example:
```cmake
set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CRT_LINKAGE dynamic)
if(PORT STREQUAL "qt5")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
```
This will build `qt5` as DLLs against the dynamic CRT, but every other library as a static library (still against the dynamic CRT).
For an example in a real project, see https://github.com/Intelight/vcpkg/blob/master/triplets/x86-windows-mixed.cmake.
## Additional Remarks
The default triplet when running any vcpkg command is `%VCPKG_DEFAULT_TRIPLET%` or `x86-windows` if that environment variable is undefined.
We recommend using a systematic naming scheme when creating new triplets. The Android toolchain naming scheme is a good source of inspiration: https://developer.android.com/ndk/guides/standalone_toolchain.html.

2
ports/arrow/CONTROL
View File

@ -1,4 +1,4 @@
Source: arrow
Version: apache-arrow-0.4.0
Version: apache-arrow-0.4.0-1
Build-Depends: boost
Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.

8
ports/arrow/portfile.cmake
View File

@ -20,9 +20,15 @@ vcpkg_configure_cmake(
OPTIONS -DARROW_BUILD_TESTS=off
)
vcpkg_install_cmake()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
else()
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/arrow RENAME copyright)

4
ports/beast/CONTROL
View File

@ -1,4 +1,4 @@
Source: beast
Version: v40
Version: v56
Build-Depends: boost
Description: HTTP and WebSocket, header-only using Boost.Asio and C++11
Description: HTTP/1 and WebSocket, header-only using Boost.Asio and C++11

4
ports/beast/portfile.cmake
View File

@ -4,8 +4,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vinniefalco/Beast
REF f2d825594ee34ccc1ebc0b231899a1735245778d
SHA512 21ea2ba77ff8c1dac873e7abd4caa03da50f155c34b39783380d4319c930be02076bf2b7ffcf93a964cac60bfb0a2ec8621156c332adedd3a2af82a27ca50e1a
REF 18c68ceec99697121ec442b35dac6c9587a9566a
SHA512 844acd6543610b17686de5b14631576091336dabdaba0800aa4bba7c6a7d55268cc7bfbcd5337a8a3055011f94cba116bb04ebc2c7e0086b25a63796c2177edd
HEAD_REF master
)

4
ports/box2d/portfile.cmake
View File

@ -7,6 +7,10 @@ elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm")
message(FATAL_ERROR "ARM not supported")
endif(TRIPLET_SYSTEM_ARCH MATCHES "x86")
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "Box2d only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")

2
ports/c-ares/CONTROL
View File

@ -1,4 +1,4 @@
Source: c-ares
Version: 1.12.1-dev-40eb41f
Version: 1.12.1-dev-40eb41f-1
Description: A C library for asynchronous DNS requests
Build-Depends:

13
ports/c-ares/portfile.cmake
View File

@ -28,14 +28,17 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/c-ares")
if(VCPKG_CRT_LINKAGE STREQUAL static)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
else()
file(GLOB RELEASE_EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe")
file(REMOVE ${RELEASE_EXE_FILES})
file(GLOB DEBUG_EXE_FILES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
file(REMOVE ${DEBUG_EXE_FILES})
file(GLOB EXE_FILES
"${CURRENT_PACKAGES_DIR}/bin/*.exe"
"${CURRENT_PACKAGES_DIR}/debug/bin/*.exe"
)
if (EXE_FILES)
file(REMOVE ${EXE_FILES})
endif()
endif()
vcpkg_copy_pdbs()

2
ports/cairo/CONTROL
View File

@ -1,4 +1,4 @@
Source: cairo
Version: 1.15.4
Version: 1.15.4-2
Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig

20
ports/cairo/portfile.cmake
View File

@ -33,7 +33,7 @@ endif()
vcpkg_install_cmake()
# Copy the appropriate header files.
file(COPY
foreach(FILE
"${SOURCE_PATH}/src/cairo.h"
"${SOURCE_PATH}/src/cairo-deprecated.h"
"${SOURCE_PATH}/src/cairo-features.h"
@ -44,10 +44,20 @@ file(COPY
"${SOURCE_PATH}/cairo-version.h"
"${SOURCE_PATH}/src/cairo-win32.h"
"${SOURCE_PATH}/util/cairo-gobject/cairo-gobject.h"
"${SOURCE_PATH}/src/cairo-ft.h"
DESTINATION
${CURRENT_PACKAGES_DIR}/include
)
"${SOURCE_PATH}/src/cairo-ft.h")
file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cairo)
endforeach()
foreach(FILE "${CURRENT_PACKAGES_DIR}/include/cairo.h" "${CURRENT_PACKAGES_DIR}/include/cairo/cairo.h")
file(READ ${FILE} CAIRO_H)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "1" CAIRO_H "${CAIRO_H}")
else()
string(REPLACE "defined (CAIRO_WIN32_STATIC_BUILD)" "0" CAIRO_H "${CAIRO_H}")
endif()
file(WRITE ${FILE} "${CAIRO_H}")
endforeach()
# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cairo)

4
ports/ceres/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: ceres
Version: 1.12.0-1
Build-Depends:suitesparse, eigen3, clapack, gflags, glog
Description: non-linear optimization package

72
ports/ceres/portfile.cmake Normal file
View File

@ -0,0 +1,72 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
if(VCPKG_CRT_LINKAGE STREQUAL "static")
message(FATAL_ERROR "Ceres does not currently support static CRT linkage")
endif()
include(vcpkg_common_functions)
set(VCPKG_PLATFORM_TOOLSET "v140") # Force VS2015 because VS2017 compiler return internal error
# eigen3\eigen\src\core\redux.h(237): fatal error C1001: An internal error has occurred in the compiler. [internal\ceres\ceres.vcxproj]
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ceres-solver/ceres-solver
REF 1.12.0
SHA512 4b4cba5627fbd80a626e8a31d9f561d6cee1c8345970304e4b5b163a9dcadc6d636257d1046ecede00781a11229ef671ee89c3e7e6baf15f49f63f36e6a2ebe1
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DEXPORT_BUILD_DIR=ON
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTING=OFF
-DCXSPARSE=ON
-DEIGENSPARSE=ON
-DSUITESPARSE=ON
-DBLAS_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/openblas.lib
-DCXSPARSE_INCLUDE_DIR=${SUITESPARSE_INCLUDE_DIR}
-DCXSPARSE_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/libcxsparse.lib
-DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3
-DGFLAGS_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
-DGFLAGS_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/gflags.lib
-DGLOG_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
-DGLOG_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/glog.lib
-DLAPACK_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/lapack.lib
-DMETIS_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/metis.lib
-DSUITESPARSE_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/suitesparse
OPTIONS_RELEASE
-DSUITESPARSE_LIBRARY_DIR_HINTS=${CURRENT_INSTALLED_DIR}/lib
OPTIONS_DEBUG
-DSUITESPARSEQR_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/libspqrd.lib
-DSUITESPARSE_LIBRARY_DIR_HINTS=${CURRENT_INSTALLED_DIR}/debug/lib
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
vcpkg_copy_pdbs()
#clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindEigen.cmake)
file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindGflags.cmake)
file(REMOVE ${CURRENT_PACKAGES_DIR}/share/ceres/FindGlog.cmake)
# Handle copyright of suitesparse and metis
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ceres)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/ceres/LICENSE ${CURRENT_PACKAGES_DIR}/share/ceres/copyright)

3
ports/cpp-redis/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: cpp-redis
Version: 3.5.1
Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.

53
ports/cpp-redis/portfile.cmake Normal file
View File

@ -0,0 +1,53 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Cylix/cpp_redis
REF 3.5.1
SHA512 2c50cf777d5955f7bcb94a55514fac444d0dcacc2df343dd89969889be7653a793620dbaac9d6dd0f444eee7f0664c4eb96a1d83477d207143660764afeea129
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DUSE_CUSTOM_TCP_CLIENT=TRUE
)
vcpkg_build_cmake()
file(GLOB DLLS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
)
file(GLOB LIBS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/lib/*.lib"
)
file(GLOB DEBUG_DLLS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
)
file(GLOB DEBUG_LIBS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/lib/*.lib"
)
file(GLOB HEADERS "${SOURCE_PATH}/includes/cpp_redis/*.hpp" "${SOURCE_PATH}/includes/cpp_redis/*.hpp")
if(DLLS)
file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
endif()
file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
if(DEBUG_DLLS)
file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cpp_redis)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)
vcpkg_copy_pdbs()

4
ports/directxmesh/portfile.cmake
View File

@ -10,6 +10,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
endif()
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DirectXMesh only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXMesh-oct2016)
vcpkg_download_distfile(ARCHIVE

4
ports/directxtex/portfile.cmake
View File

@ -10,6 +10,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
endif()
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DirectXTex only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/directxtex-dec2016)
vcpkg_download_distfile(ARCHIVE

4
ports/directxtk/portfile.cmake
View File

@ -3,6 +3,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
endif()
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DirectXTk only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK-dec2016)
vcpkg_download_distfile(ARCHIVE

4
ports/directxtk12/portfile.cmake
View File

@ -3,6 +3,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
endif()
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DirectXTk12 only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK12-dec2016)
vcpkg_download_distfile(ARCHIVE

5
ports/dxut/portfile.cmake
View File

@ -2,6 +2,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(STATUS "Warning: Dynamic building not supported yet. Building static.")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DXUT-sept2016)
vcpkg_download_distfile(ARCHIVE_FILE

4
ports/entityx/portfile.cmake
View File

@ -11,6 +11,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
endif()
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "Entityx only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/entityx-1.2.0)
vcpkg_download_distfile(ARCHIVE

3
ports/flann/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: flann
Version: 1.9.1
Description: performing fast approximate nearest neighbor searches in high dimensional spaces

41
ports/flann/fix-install-flann.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git "a/src/cpp/CMakeLists.txt" "b/src/cpp/CMakeLists.txt"
index 49c53f0..cc58c90 100644
--- "a/src/cpp/CMakeLists.txt"
+++ "b/src/cpp/CMakeLists.txt"
@@ -87,7 +87,7 @@ if (BUILD_C_BINDINGS)
set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
else()
- add_library(flann SHARED ${C_SOURCES})
+ add_library(flann ${C_SOURCES})
if(MINGW AND OPENMP_FOUND)
target_link_libraries(flann gomp)
@@ -111,12 +111,12 @@ endif()
endif(WIN32)
-install (
- TARGETS flann_cpp flann_cpp_s
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
-)
+#install (
+# TARGETS flann_cpp flann_cpp_s
+# RUNTIME DESTINATION bin
+# LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
+# ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
+#)
if (BUILD_CUDA_LIB)
install (
@@ -129,7 +129,7 @@ endif()
if (BUILD_C_BINDINGS)
install (
- TARGETS flann flann_s
+ TARGETS flann
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}

51
ports/flann/portfile.cmake Normal file
View File

@ -0,0 +1,51 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mariusmuja/flann
REF 1.9.1
SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-flann.patch"
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
#PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
-DBUILD_EXAMPLES=OFF
-DBUILD_PYTHON_BINDINGS=OFF
-DBUILD_MATLAB_BINDINGS=OFF
-DBUILD_DOC=OFF
OPTIONS_RELEASE
-DFLANN_LIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib
OPTIONS_DEBUG
-DFLANN_LIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib
)
vcpkg_install_cmake()
#clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/README.md ${CURRENT_PACKAGES_DIR}/share/flann/copyright)

2
ports/fltk/CONTROL
View File

@ -1,4 +1,4 @@
Source: fltk
Version: 1.3.4-3
Version: 1.3.4-4
Description: FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.
Build-Depends: zlib, libpng, libjpeg-turbo

11
ports/fltk/portfile.cmake
View File

@ -28,6 +28,7 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DOPTION_BUILD_EXAMPLES=OFF
-DOPTION_USE_SYSTEM_ZLIB=ON
@ -71,6 +72,16 @@ else()
endforeach()
endif()
foreach(FILE Fl_Export.H fl_utf8.h)
file(READ ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} FLTK_HEADER)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
string(REPLACE "defined(FL_DLL)" "0" FLTK_HEADER "${FLTK_HEADER}")
else()
string(REPLACE "defined(FL_DLL)" "1" FLTK_HEADER "${FLTK_HEADER}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} "${FLTK_HEADER}")
endforeach()
file(INSTALL
${SOURCE_PATH}/COPYING
DESTINATION ${CURRENT_PACKAGES_DIR}/share/fltk

2
ports/gtk/CONTROL
View File

@ -1,4 +1,4 @@
Source: gtk
Version: 3.22.14
Version: 3.22.15
Description: Portable library for creating graphical user interfaces.
Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext

4
ports/gtk/portfile.cmake
View File

@ -1,11 +1,11 @@
include(vcpkg_common_functions)
set(GTK_VERSION 3.22.14)
set(GTK_VERSION 3.22.15)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gtk+-${GTK_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-${GTK_VERSION}.tar.xz"
FILENAME "gtk+-${GTK_VERSION}.tar.xz"
SHA512 f7b2cfc63f8c849c45dc4f80c8115dcf20d0da63718eedbe133f8ac86c17488a91fecb8a0e47bb6b48f81b06ce6897540d900ab8bfbe673426dacf4f7ef74e8b)
SHA512 c99c4a52bc447a21be20546bdc7808081abde076af9603424c1de20af031ac3f9bd121709d4c18705db8ba2f66ace0aae9b32741347788a8d81afa358d67e758)
vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

15
ports/harfbuzz/0001-fix-uwp-build.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git "a/harfbuzz-1.4.6/src/hb-ft.cc" "b/harfbuzz-1.4.6/src/hb-ft.cc"
index 48d6a0ef..f4ce6608 100644
--- "a/harfbuzz-1.4.6/src/hb-ft.cc"
+++ "b/harfbuzz-1.4.6/src/hb-ft.cc"
@@ -31,6 +31,10 @@
#include "hb-ft.h"
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
+#define generic GenericFromFreeTypeLibrary
+#endif
+
#include "hb-font-private.hh"
#include "hb-cache-private.hh" // Maybe use in the future?

4
ports/harfbuzz/CONTROL
View File

@ -1,4 +1,4 @@
Source: harfbuzz
Version: 1.4.6
Version: 1.4.6-1
Description: HarfBuzz OpenType text shaping engine
Build-Depends: freetype, glib
Build-Depends: freetype, glib [windows]

17
ports/harfbuzz/portfile.cmake
View File

@ -7,13 +7,26 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/
PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch"
)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
SET(HAVE_GLIB "OFF")
SET(BUILTIN_UCDN "ON")
else()
SET(HAVE_GLIB "ON")
SET(BUILTIN_UCDN "OFF")
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DHB_HAVE_FREETYPE=ON
-DHB_HAVE_GLIB=ON
-DHB_BUILTIN_UCDN=OFF
-DHB_HAVE_GLIB=${HAVE_GLIB}
-DHB_BUILTIN_UCDN=${BUILTIN_UCDN}
OPTIONS_DEBUG
-DSKIP_INSTALL_HEADERS=ON
)

3
ports/ilmbase/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: ilmbase
Version: 2.2.0
Description: Base libraries from ILM for OpenEXR

54
ports/ilmbase/fix-parallel-build.patch Normal file
View File

@ -0,0 +1,54 @@
diff --git a/Half/CMakeLists.txt b/Half/CMakeLists.txt
index 6f9714d..0c43904 100644
--- a/Half/CMakeLists.txt
+++ b/Half/CMakeLists.txt
@@ -2,10 +2,10 @@
ADD_EXECUTABLE ( eLut eLut.cpp )
-ADD_CUSTOM_COMMAND (
- TARGET eLut POST_BUILD
+ADD_CUSTOM_TARGET ( make_eLut
COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS eLut
)
SET_SOURCE_FILES_PROPERTIES(
${CMAKE_CURRENT_BINARY_DIR}/eLut.h
@@ -13,25 +13,16 @@ SET_SOURCE_FILES_PROPERTIES(
)
ADD_EXECUTABLE ( toFloat toFloat.cpp )
-ADD_CUSTOM_COMMAND (
- TARGET toFloat POST_BUILD
+ADD_CUSTOM_TARGET ( make_toFloat
COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS toFloat
)
SET_SOURCE_FILES_PROPERTIES(
${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
PROPERTIES HEADER_FILE_ONLY TRUE
)
-SET_SOURCE_FILES_PROPERTIES(
- half.cpp
- PROPERTIES
- OBJECT_DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
- OBJECT_DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
- )
-
IF(BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DHALF_EXPORTS)
ENDIF()
@@ -41,7 +32,7 @@ ADD_LIBRARY ( Half ${LIB_TYPE}
)
-ADD_DEPENDENCIES ( Half toFloat eLut )
+ADD_DEPENDENCIES ( Half make_toFloat make_eLut )
INSTALL ( TARGETS
Half

49
ports/ilmbase/portfile.cmake Normal file
View File

@ -0,0 +1,49 @@
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "UWP build not supported")
endif()
set(ILM_VERSION 2.2.0)
set(ILM_HASH 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1)
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ilmbase-${ILM_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILM_VERSION}.tar.gz"
FILENAME "ilmbase-${ILM_VERSION}.zip"
SHA512 ${ILM_HASH})
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-parallel-build.patch)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA)
vcpkg_install_cmake()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
foreach(SUBDIR "" "/debug")
file(GLOB DLLS ${CURRENT_PACKAGES_DIR}${SUBDIR}/lib/*.dll)
file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}${SUBDIR}/bin)
file(REMOVE ${DLLS})
endforeach()
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs()
foreach(HEADER halfExport.h IexExport.h IexMathFloatExc.h IlmThreadExport.h ImathExport.h)
file(READ ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} HEADER_FILE)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
string(REPLACE "defined(OPENEXR_DLL)" "1" HEADER_FILE "${HEADER_FILE}")
else()
string(REPLACE "defined(OPENEXR_DLL)" "0" HEADER_FILE "${HEADER_FILE}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/OpenEXR/${HEADER} "${HEADER_FILE}")
endforeach()
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ilmbase)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/ilmbase/LICENSE ${CURRENT_PACKAGES_DIR}/share/ilmbase/copyright)

4
ports/jasper/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: jasper
Version: 2.0.13
Description: Open source implementation of the JPEG-2000 Part-1 standard
Build-Depends: libjpeg-turbo

41
ports/jasper/portfile.cmake Normal file
View File

@ -0,0 +1,41 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mdadams/jasper
REF version-2.0.13
SHA512 8c09a7b773e739a2594cd1002fe66f79ea4336f7de7c97267ab976c06ba075468a7f3c8731dff13a98221cd11d3f2bf8dcddb3fc2c2fc7d7c5ba402bcd3f9fd8
HEAD_REF master)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(JASPER_LINKAGE -DJAS_ENABLE_SHARED=OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF
-DJAS_ENABLE_LIBJPEG=ON
-DJAS_ENABLE_OPENGL=OFF # not needed for the library
-DJAS_ENABLE_DOC=OFF
${JASPER_LINKAGE})
vcpkg_install_cmake()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
else()
file(GLOB EXECS ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
file(REMOVE ${EXECS})
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs()
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jasper)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/jasper/LICENSE ${CURRENT_PACKAGES_DIR}/share/jasper/copyright)

2
ports/libbson/CONTROL
View File

@ -1,3 +1,3 @@
Source: libbson
Version: 1.6.2
Version: 1.6.2-1
Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.

2
ports/libbson/portfile.cmake
View File

@ -53,6 +53,8 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
PATCHES
${CMAKE_CURRENT_LIST_DIR}/static.patch
)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
endif()
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson RENAME copyright)

2
ports/libepoxy/CONTROL
View File

@ -1,3 +1,3 @@
Source: libepoxy
Version: 1.4.2
Version: 1.4.3
Description: Epoxy is a library for handling OpenGL function pointer management for you

18
ports/libepoxy/portfile.cmake
View File

@ -7,19 +7,19 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO anholt/libepoxy
REF 1.4.2
SHA512 b94e1fe749c63a82f38369ff62b7d0d8cf1c55884159f030dc2919c17daf5811dd71cfd6a663edb38df66ff4ca53120a6a53501568cc8a582f08d4ae82fe9d89
REF 1.4.3
SHA512 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0
HEAD_REF master)
# ensure python is on path - not for meson but some source generation scripts
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PYTHON3_PATH}")
vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH})
vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-Denable-glx=no
-Denable-egl=no)
vcpkg_install_meson()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig)
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libepoxy)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libepoxy/COPYING ${CURRENT_PACKAGES_DIR}/share/libepoxy/copyright)

28
ports/lpeg/CMakeLists.txt Normal file
View File

@ -0,0 +1,28 @@
cmake_minimum_required(VERSION 3.0)
project(lpeg)
if(NOT WIN32)
message(FATAL_ERROR "Written for windows only")
endif()
find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua)
find_library(LUA_LIBRARY lua)
set(LPEG_INCLUDES ${LUA_INCLUDE_DIR})
set(LPEG_LIBRARIES ${LUA_LIBRARY})
add_library(lpeg
lpvm.c
lptree.c
lpprint.c
lpcap.c
lpcode.c
lpeg.def)
target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES})
target_link_libraries(lpeg PRIVATE ${LPEG_LIBRARIES})
install(TARGETS lpeg
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
install(FILES re.lua DESTINATION share/lua)

4
ports/lpeg/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: lpeg
Version: 1.0.1-2
Description: LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).
Build-Depends: lua

3
ports/lpeg/lpeg.def Normal file
View File

@ -0,0 +1,3 @@
LIBRARY lpeg
EXPORTS
luaopen_lpeg

32
ports/lpeg/portfile.cmake Normal file
View File

@ -0,0 +1,32 @@
#cmake-only scripts
include(vcpkg_common_functions)
set(LPEG_VER 1.0.1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lpeg-${LPEG_VER})
vcpkg_download_distfile(ARCHIVE
URLS "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${LPEG_VER}.tar.gz"
FILENAME "lpeg-${LPEG_VER}.tar.gz"
SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
)
vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/lpeg.def DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()
# Remove debug share
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/lpeg.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/lpeg RENAME copyright)
# Allow empty include directory
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

21
ports/luafilesystem/CMakeLists.txt Normal file
View File

@ -0,0 +1,21 @@
cmake_minimum_required(VERSION 3.0)
project(luafilesystem)
if(NOT WIN32)
message(FATAL_ERROR "Written for windows only")
endif()
find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua)
find_library(LUA_LIBRARY lua)
set(LFS_INCLUDES ${LUA_INCLUDE_DIR})
set(LFS_LIBRARIES ${LUA_LIBRARY})
add_library( lfs src/lfs.h src/lfs.c src/lfs.def)
target_include_directories(lfs PRIVATE ${LFS_INCLUDES})
target_link_libraries(lfs PRIVATE ${LFS_LIBRARIES})
install(TARGETS lfs
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)

4
ports/luafilesystem/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: luafilesystem
Version: 1.6.3
Description: LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.
Build-Depends: lua

21
ports/luafilesystem/lfs-def-fix.patch Normal file
View File

@ -0,0 +1,21 @@
From 644c9c32ca9053ced3d37ff76fc1fbc0389ddf53 Mon Sep 17 00:00:00 2001
From: Alex <null@null.null>
Date: Mon, 16 Feb 2015 08:15:41 +0300
Subject: [PATCH] DEF file fixes (DESCRIPTION is deprecated; VERSION must
contain one or two numers)
---
src/lfs.def | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lfs.def b/src/lfs.def
index 7aa7a35..8a36d41 100644
--- a/src/lfs.def
+++ b/src/lfs.def
@@ -1,5 +1,4 @@
LIBRARY lfs.dll
-DESCRIPTION "LuaFileSystem"
-VERSION 1.5.0
+VERSION 1.6
EXPORTS
luaopen_lfs

35
ports/luafilesystem/portfile.cmake Normal file
View File

@ -0,0 +1,35 @@
include(vcpkg_common_functions)
set(LUAFILESYSTEM_VERSION 1.6.3)
set(LUAFILESYSTEM_REVISION v_1_6_3)
set(LUAFILESYSTEM_HASH abfa1b3ac22ed80189560a1a025a7ea21a954defe14e5b539e08f266d180962a691262efc7eb2ddacc2d4aae14d6e356b1a276165b5bed46a13e4d6c61ab99f1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/luafilesystem-${LUAFILESYSTEM_VERSION})
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO keplerproject/luafilesystem
REF ${LUAFILESYSTEM_REVISION}
SHA512 ${LUAFILESYSTEM_HASH}
HEAD_REF master)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/lfs-def-fix.patch)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/luafilesystem)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/luafilesystem/LICENSE ${CURRENT_PACKAGES_DIR}/share/luafilesystem/copyright)
# Allow empty include directory
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

5
ports/octomap/portfile.cmake
View File

@ -1,3 +1,8 @@
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
message("Octomap does not currently support building purely static. Building dynamic instead.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(GIT_REF "cefed0c1d79afafa5aeb05273cf1246b093b771c")
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/octomap-${GIT_REF})

2
ports/openblas/CONTROL
View File

@ -1,3 +1,3 @@
Source: openblas
Version: v0.2.19-1
Version: v0.2.19-2
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.

6
ports/openblas/portfile.cmake
View File

@ -18,7 +18,7 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
message(WARNING "openblas only support dynamic link for msvc")
message("openblas currenly only supports dynamic library linkage")
set(VCPKG_LIBRARY_LINKAGE "dynamic")
endif()
@ -61,8 +61,8 @@ file(COPY ${SOURCE_PATH}/config.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(RENAME ${CURRENT_PACKAGES_DIR}/include/config.h ${CURRENT_PACKAGES_DIR}/include/openblas_config.h)
file(READ ${SOURCE_PATH}/cblas.h CBLAS_H)
string(REPLACE "#include \"common.h\"" "#include \"openblas_common.h\"" CBLAS_H ${CBLAS_H})
file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h ${CBLAS_H})
string(REPLACE "#include \"common.h\"" "#include \"openblas_common.h\"" CBLAS_H "${CBLAS_H}")
file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h "${CBLAS_H}")
# openblas is BSD
file(COPY ${CURRENT_BUILDTREES_DIR}/src/OpenBLAS-0.2.19/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openblas)

2
ports/openssl/CONTROL
View File

@ -1,3 +1,3 @@
Source: openssl
Version: 1.0.2k-3
Version: 1.0.2k-5
Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.

13
ports/openssl/fix-uwp-pathlib.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git "a/ms/setVSvars.bat" "b/ms/setVSvars.bat"
index e6ebc0a7..cde9afb2 100644
--- "a/ms/setVSvars.bat"
+++ "b/ms/setVSvars.bat"
@@ -179,7 +179,7 @@ exit /b
call:setVar _VS14VC VisualStudio14VC
call:setVar _WKITS10 WindowsKits10.0
set PATH=%_VS14VCBin%;%PATH%
- set "LIBPATH=%_WKITS10%UnionMetadata\Facade;%_VS14VC%vcpackages;%_WKITS10%references\windows.foundation.foundationcontract\1.0.0.0\;%_WKITS10%references\windows.foundation.universalapicontract\1.0.0.0\"
+ set "LIBPATH=%_WKITS10%UnionMetadata\Facade;%_VS14VC%vcpackages;%_WKITS10%references\windows.foundation.foundationcontract\2.0.0.0\;%_WKITS10%references\windows.foundation.universalapicontract\3.0.0.0\"
goto :eof
:end

14
ports/openssl/make-openssl.bat
View File

@ -1,10 +1,20 @@
set build=%1
perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL
perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL -FS -FIWindows.h
set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\3.0.0.0\
set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\2.0.0.0\
set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\1.0.0.0\
set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\4.0.0.0\
set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\3.0.0.0\
set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\2.0.0.0\
set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\1.0.0.0\
call ms\do_winuniversal.bat
call ms\setVSvars.bat universal10.0%build%
mkdir inc32\openssl
jom -j %NUMBER_OF_PROCESSORS% -k -f ms\ntdll.mak
REM due to a race condition in the build, we need to have a second single-threaded pass.
nmake -f ms\ntdll.mak

12
ports/openssl/portfile-uwp.cmake
View File

@ -7,7 +7,8 @@
#
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Static building not supported yet")
set(VCPKG_LIBRARY_LINKAGE dynamic)
message("Static building not supported yet")
endif()
if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@ -29,8 +30,10 @@ include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2k_WinRT)
vcpkg_find_acquire_program(PERL)
vcpkg_find_acquire_program(JOM)
get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY)
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}")
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2k_WinRT.zip"
@ -40,6 +43,11 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-pathlib.patch
)
file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll)
file(REMOVE_RECURSE ${SOURCE_PATH}/out32dll)
file(REMOVE_RECURSE ${SOURCE_PATH}/inc32dll)

25
ports/openssl/portfile.cmake
View File

@ -13,6 +13,7 @@ find_program(NMAKE nmake)
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
vcpkg_find_acquire_program(JOM)
set(ENV{PATH} "${PERL_EXE_PATH};${NASM_EXE_PATH};$ENV{PATH}")
vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
@ -60,7 +61,7 @@ set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-
set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR})
vcpkg_execute_required_process(
COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}"
COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
)
@ -69,10 +70,19 @@ vcpkg_execute_required_process(
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
)
# Openssl's buildsystem has a race condition which will cause JOM to fail at some point.
# This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build.
make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl)
execute_process(
COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log
ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log
)
vcpkg_execute_required_process(
COMMAND ${NMAKE} -f ${OPENSSL_MAKEFILE} install
WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
LOGNAME build-${TARGET_TRIPLET}-rel)
LOGNAME build-${TARGET_TRIPLET}-rel-1)
message(STATUS "Build ${TARGET_TRIPLET}-rel done")
@ -83,7 +93,7 @@ set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/openssl-${
set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug)
vcpkg_execute_required_process(
COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}"
COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
)
@ -92,10 +102,17 @@ vcpkg_execute_required_process(
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
)
make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl)
execute_process(
COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log
ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log
)
vcpkg_execute_required_process(
COMMAND ${NMAKE} -f ${OPENSSL_MAKEFILE} install
WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
LOGNAME build-${TARGET_TRIPLET}-dbg)
LOGNAME build-${TARGET_TRIPLET}-dbg-1)
message(STATUS "Build ${TARGET_TRIPLET}-dbg done")

4
ports/paho-mqtt/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: paho-mqtt
Version: Version 1.1.0 (Paho 1.2)
Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things
Build-Depends: openssl

56
ports/paho-mqtt/portfile.cmake Normal file
View File

@ -0,0 +1,56 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eclipse/paho.mqtt.c
REF v1.1.0
SHA512 49eebf258e15076048103ff79442ad0d21164b83f713eee7f226998106b5931d310871d3b372322d5ef1cb2801219a6e626400b6fe4198814150a6277d6bfd74
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DPAHO_WITH_SSL=TRUE
)
vcpkg_build_cmake()
file(GLOB DLLS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
)
file(GLOB LIBS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.lib"
)
file(GLOB DEBUG_DLLS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
)
file(GLOB DEBUG_LIBS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.lib"
)
file(GLOB HEADERS "${SOURCE_PATH}/*/*.h")
if(DLLS)
file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
endif()
file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
if(DEBUG_DLLS)
file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/paho-mqtt RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

2
ports/pango/CONTROL
View File

@ -1,4 +1,4 @@
Source: pango
Version: 1.40.5-2
Version: 1.40.6
Description: Text and font handling library.
Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz

4
ports/pango/portfile.cmake
View File

@ -1,10 +1,10 @@
include(vcpkg_common_functions)
set(PANGO_VERSION 1.40.5)
set(PANGO_VERSION 1.40.6)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pango-${PANGO_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-${PANGO_VERSION}.tar.xz"
FILENAME "pango-${PANGO_VERSION}.tar.xz"
SHA512 40e8bf85dbb4b6fd35da3acec06a0d2b9dde95a3c5a212d243dbcbc0d00f12bd061757a04cb2f4a8db61329efd7ed9be53e3f5d6a2eb2a3defba1d12f9eed43d)
SHA512 d916b364a77de3e68779e6d841d95bca456daf89405b92eaf51dceef093a9761cbb6c48f4c2971dec47c0bbdb645a3f3f4fb9af425274bf1d1822b278575e1f7)
vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

4
ports/pdcurses/portfile.cmake
View File

@ -1,4 +1,8 @@
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "PDCurses only supports dynamic CRT linkage")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET})
find_program(NMAKE nmake)

2
ports/portaudio/CONTROL
View File

@ -1,3 +1,3 @@
Source: portaudio
Version: 19.0.6.00
Version: 19.0.6.00-1
Description: PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.

61
ports/portaudio/crt_linkage_build_config.patch Normal file
View File

@ -0,0 +1,61 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,32 +10,32 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
# project. If this is part of a larger project (i.e. the CMakeLists.txt has
# been imported by some other CMakeLists.txt), we don't want to trump over
# the top of that project's global settings.
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR})
- IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- MESSAGE(STATUS "Setting CMAKE_BUILD_TYPE type to 'Debug' as none was specified.")
- SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
- SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
- ENDIF()
-
- PROJECT(portaudio)
-
- SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
-
- IF(WIN32 AND MSVC)
- OPTION(PA_DLL_LINK_WITH_STATIC_RUNTIME "Link with static runtime libraries (minimizes runtime dependencies)" ON)
- IF(PA_DLL_LINK_WITH_STATIC_RUNTIME)
- FOREACH(flag_var
- CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
- CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
- IF(${flag_var} MATCHES "/MD")
- STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
- ENDIF()
- ENDFOREACH()
- ENDIF()
- ENDIF()
-ENDIF()
+# IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR})
+ # IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ # MESSAGE(STATUS "Setting CMAKE_BUILD_TYPE type to 'Debug' as none was specified.")
+ # SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
+ # SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
+ # ENDIF()
+
+ # PROJECT(portaudio)
+
+ # SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+
+ # IF(WIN32 AND MSVC)
+ # OPTION(PA_DLL_LINK_WITH_STATIC_RUNTIME "Link with static runtime libraries (minimizes runtime dependencies)" ON)
+ # IF(PA_DLL_LINK_WITH_STATIC_RUNTIME)
+ # FOREACH(flag_var
+ # CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+ # CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
+ # CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
+ # CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+ # IF(${flag_var} MATCHES "/MD")
+ # STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+ # ENDIF()
+ # ENDFOREACH()
+ # ENDIF()
+ # ENDIF()
+# ENDIF()
SET(PA_PKGCONFIG_VERSION 19)

114
ports/portaudio/find_dsound.patch Normal file
View File

@ -0,0 +1,114 @@
--- a/cmake_support/FindDXSDK.cmake
+++ b/cmake_support/FindDXSDK.cmake
@@ -16,44 +16,70 @@ else(WIN32)
message(FATAL_ERROR "FindDXSDK.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" )
endif(WIN32)
-find_path(DXSDK_ROOT_DIR
- include/dxsdkver.h
- HINTS
- $ENV{DXSDK_DIR}
-)
-
-find_path(DXSDK_INCLUDE_DIR
- dxsdkver.h
- PATHS
- ${DXSDK_ROOT_DIR}/include
-)
-
-IF(CMAKE_CL_64)
-find_path(DXSDK_LIBRARY_DIR
- dsound.lib
- PATHS
- ${DXSDK_ROOT_DIR}/lib/x64
-)
-ELSE(CMAKE_CL_64)
-find_path(DXSDK_LIBRARY_DIR
- dsound.lib
- PATHS
- ${DXSDK_ROOT_DIR}/lib/x86
-)
-ENDIF(CMAKE_CL_64)
-
-find_library(DXSDK_DSOUND_LIBRARY
- dsound.lib
- PATHS
- ${DXSDK_LIBRARY_DIR}
-)
-
-# handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXSDK DEFAULT_MSG DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(
- DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR
- DXSDK_LIBRARY_DIR DXSDK_DSOUND_LIBRARY
-)
+# Dsound.lib is statically linked (i.e. dsound.dll not required) and DXSDK_LIBRARY_DIR not used.
+# In the environments supported by VCPKG we may as well avoid looking out for DX9 to avoid version
+# mismatch in find.
+
+if(MSVC AND MSVC_VERSION GREATER_EQUAL 1900)
+
+ # if the environment is set up properly, matching lib and header will be found
+
+ find_path(DXSDK_INCLUDE_DIR
+ dsound.h
+ )
+ find_library(DXSDK_DSOUND_LIBRARY
+ dsound.lib
+ )
+
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXSDK DEFAULT_MSG DXSDK_INCLUDE_DIR DXSDK_DSOUND_LIBRARY)
+
+ MARK_AS_ADVANCED(
+ DXSDK_INCLUDE_DIR DXSDK_DSOUND_LIBRARY
+ )
+
+else()
+
+ find_path(DXSDK_ROOT_DIR
+ include/dxsdkver.h
+ HINTS
+ $ENV{DXSDK_DIR}
+ )
+
+ find_path(DXSDK_INCLUDE_DIR
+ dxsdkver.h
+ HINTS
+ ${DXSDK_ROOT_DIR}/include
+ )
+
+ IF(CMAKE_CL_64)
+ find_path(DXSDK_LIBRARY_DIR
+ dsound.lib
+ HINTS
+ ${DXSDK_ROOT_DIR}/lib/x64
+ )
+ ELSE(CMAKE_CL_64)
+ find_path(DXSDK_LIBRARY_DIR
+ dsound.lib
+ HINTS
+ ${DXSDK_ROOT_DIR}/lib/x86
+ )
+ ENDIF(CMAKE_CL_64)
+
+ find_library(DXSDK_DSOUND_LIBRARY
+ dsound.lib
+ HINTS
+ ${DXSDK_LIBRARY_DIR}
+ )
+
+ # handle the QUIETLY and REQUIRED arguments and set DXSDK_FOUND to TRUE if
+ # all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(DXSDK DEFAULT_MSG DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR)
+
+ MARK_AS_ADVANCED(
+ DXSDK_ROOT_DIR DXSDK_INCLUDE_DIR
+ DXSDK_LIBRARY_DIR DXSDK_DSOUND_LIBRARY
+ )
+
+endif()

13
ports/portaudio/portfile.cmake
View File

@ -18,18 +18,27 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/cmakelists-install.patch)
${CMAKE_CURRENT_LIST_DIR}/cmakelists-install.patch
${CMAKE_CURRENT_LIST_DIR}/find_dsound.patch
${CMAKE_CURRENT_LIST_DIR}/crt_linkage_build_config.patch)
# NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided
# in a sibling folder of the portaudio source in vcpkg/buildtrees/portaudio/src
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DPA_USE_DS=ON
-DPA_USE_WASAPI=ON
-DPA_USE_WDMKS=ON
-DPA_USE_WMME=ON
)
vcpkg_install_cmake()
# Remove static builds from dynamic builds and otherwise
# Remove x86 and x64 from resulting files
if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file (REMOVE ${CURRENT_PACKAGES_DIR}/lib/portaudio_static_${VCPKG_TARGET_ARCHITECTURE}.lib)
file (REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/portaudio_static_${VCPKG_TARGET_ARCHITECTURE}.lib)

13
ports/protobuf/0001-fix-missing-export.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h
index 4417446..a7154b4 100644
--- a/src/google/protobuf/generated_message_util.h
+++ b/src/google/protobuf/generated_message_util.h
@@ -164,7 +164,7 @@ class ExplicitlyConstructed {
// Default empty string object. Don't use this directly. Instead, call
// GetEmptyString() to get the reference.
-extern ExplicitlyConstructed< ::std::string> fixed_address_empty_string;
+LIBPROTOBUF_EXPORT extern ExplicitlyConstructed< ::std::string> fixed_address_empty_string;
LIBPROTOBUF_EXPORT extern ProtobufOnceType empty_string_once_init_;
LIBPROTOBUF_EXPORT void InitEmptyString();

2
ports/protobuf/CONTROL
View File

@ -1,4 +1,4 @@
Source: protobuf
Version: 3.3.0
Version: 3.3.0-1
Build-Depends: zlib
Description: Protocol Buffers - Google's data interchange format

9
ports/protobuf/portfile.cmake
View File

@ -17,6 +17,15 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/protobuf-${PROTOBUF_VERSION})
set(TOOL_PATH ${CURRENT_BUILDTREES_DIR}/src/protobuf-${PROTOBUF_VERSION}-win32)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
# Patch to fix the missing export of fixed_address_empty_string,
# see https://github.com/google/protobuf/pull/3216
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/protobuf-${PROTOBUF_VERSION}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-missing-export.patch"
)
vcpkg_extract_source_archive(${TOOL_ARCHIVE_FILE} ${TOOL_PATH})
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

5
ports/pybind11/CONTROL
View File

@ -1,3 +1,4 @@
Source: pybind11
Version: 2.1.0
Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code.
Version: 2.1.0-1
Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code.
Build-Depends: python3

31
ports/pybind11/portfile.cmake
View File

@ -1,17 +1,32 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pybind11-2.1.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/pybind/pybind11/archive/v2.1.0.tar.gz"
FILENAME "pybind11-2.1.0.tar.gz"
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pybind/pybind11
REF v2.1.0
SHA512 2f74dcd2b82d8e41da7db36351284fe04511038bec66bdde820da9c0fce92f6d2c5aeb2e48264058a91a775a1a6a99bc757d26ebf001de3df4183d700d46efa1
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYPATH ${PYTHON3} PATH)
set(ENV{PATH} "$ENV{PATH};${PYPATH}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DPYBIND11_TEST=OFF
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DPYBIND11_TEST=OFF
-DPYTHONLIBS_FOUND=ON
-DPYTHON_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include
-DPYTHON_MODULE_EXTENSION=.dll
OPTIONS_RELEASE
-DPYTHON_IS_DEBUG=OFF
-DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/python36.lib
OPTIONS_DEBUG
-DPYTHON_IS_DEBUG=ON
-DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/python36_d.lib
)
vcpkg_install_cmake()

3
ports/qhull/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: qhull
Version:1.0
Description: computes the convex hull, Delaunay triangulation, Voronoi diagram

46
ports/qhull/portfile.cmake Normal file
View File

@ -0,0 +1,46 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO qhull/qhull
REF master
SHA512 16aa9f93ce6fe8342a3b579881f10bb417679b0a70849e6b0cc5a89551e4de773a43bb0d54948196690d68d168f3a2a215e4600745ff1566302b0b426565fb25
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
#PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
-DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include
-DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
-DDOC_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
OPTIONS_RELEASE
-Dqhull_TARGETS_INSTALL=qhullcpp
-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib
OPTIONS_DEBUG
-Dqhull_TARGETS_INSTALL=qhullcpp_d
-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(GLOB_RECURSE HTMFILES ${CURRENT_PACKAGES_DIR}/include/*.htm)
file(REMOVE ${HTMFILES})
# Handle copyright
file(COPY ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/qhull)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/qhull/README.txt ${CURRENT_PACKAGES_DIR}/share/qhull/copyright)

2
ports/qt5/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5
Version: 5.8-2
Version: 5.8-3
Description: Qt5 application framework main components. Webengine, examples and tests not included.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre, harfbuzz, sqlite3, libpq, double-conversion

801
ports/qt5/add-private-header-paths.patch Normal file
View File

@ -0,0 +1,801 @@
diff --git a/Qt53DCore/Qt53DCoreConfig.cmake b/Qt53DCore/Qt53DCoreConfig.cmake
index 80fc091..4fbaf5e 100644
--- a/Qt53DCore/Qt53DCoreConfig.cmake
+++ b/Qt53DCore/Qt53DCoreConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DCore)
set(_Qt53DCore_OWN_INCLUDE_DIRS "${_qt53DCore_install_prefix}/include/" "${_qt53DCore_install_prefix}/include/Qt3DCore")
- set(Qt53DCore_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DCore_PRIVATE_INCLUDE_DIRS
+ "${_qt53DCore_install_prefix}/include/Qt3DCore/5.8.0"
+ "${_qt53DCore_install_prefix}/include/Qt3DCore/5.8.0/Qt3DCore"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DCore_OWN_INCLUDE_DIRS})
diff --git a/Qt53DExtras/Qt53DExtrasConfig.cmake b/Qt53DExtras/Qt53DExtrasConfig.cmake
index 61de455..5f00da8 100644
--- a/Qt53DExtras/Qt53DExtrasConfig.cmake
+++ b/Qt53DExtras/Qt53DExtrasConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DExtras)
set(_Qt53DExtras_OWN_INCLUDE_DIRS "${_qt53DExtras_install_prefix}/include/" "${_qt53DExtras_install_prefix}/include/Qt3DExtras")
- set(Qt53DExtras_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DExtras_PRIVATE_INCLUDE_DIRS
+ "${_qt53DExtras_install_prefix}/include/Qt3DExtras/5.8.0"
+ "${_qt53DExtras_install_prefix}/include/Qt3DExtras/5.8.0/Qt3DExtras"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DExtras_OWN_INCLUDE_DIRS})
diff --git a/Qt53DInput/Qt53DInputConfig.cmake b/Qt53DInput/Qt53DInputConfig.cmake
index 1526967..089441e 100644
--- a/Qt53DInput/Qt53DInputConfig.cmake
+++ b/Qt53DInput/Qt53DInputConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DInput)
set(_Qt53DInput_OWN_INCLUDE_DIRS "${_qt53DInput_install_prefix}/include/" "${_qt53DInput_install_prefix}/include/Qt3DInput")
- set(Qt53DInput_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DInput_PRIVATE_INCLUDE_DIRS
+ "${_qt53DInput_install_prefix}/include/Qt3DInput/5.8.0"
+ "${_qt53DInput_install_prefix}/include/Qt3DInput/5.8.0/Qt3DInput"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DInput_OWN_INCLUDE_DIRS})
diff --git a/Qt53DLogic/Qt53DLogicConfig.cmake b/Qt53DLogic/Qt53DLogicConfig.cmake
index 336f0dc..963be42 100644
--- a/Qt53DLogic/Qt53DLogicConfig.cmake
+++ b/Qt53DLogic/Qt53DLogicConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DLogic)
set(_Qt53DLogic_OWN_INCLUDE_DIRS "${_qt53DLogic_install_prefix}/include/" "${_qt53DLogic_install_prefix}/include/Qt3DLogic")
- set(Qt53DLogic_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DLogic_PRIVATE_INCLUDE_DIRS
+ "${_qt53DLogic_install_prefix}/include/Qt3DLogic/5.8.0"
+ "${_qt53DLogic_install_prefix}/include/Qt3DLogic/5.8.0/Qt3DLogic"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DLogic_OWN_INCLUDE_DIRS})
diff --git a/Qt53DQuick/Qt53DQuickConfig.cmake b/Qt53DQuick/Qt53DQuickConfig.cmake
index cf510c9..0277c0c 100644
--- a/Qt53DQuick/Qt53DQuickConfig.cmake
+++ b/Qt53DQuick/Qt53DQuickConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DQuick)
set(_Qt53DQuick_OWN_INCLUDE_DIRS "${_qt53DQuick_install_prefix}/include/" "${_qt53DQuick_install_prefix}/include/Qt3DQuick")
- set(Qt53DQuick_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DQuick_PRIVATE_INCLUDE_DIRS
+ "${_qt53DQuick_install_prefix}/include/Qt3DQuick/5.8.0"
+ "${_qt53DQuick_install_prefix}/include/Qt3DQuick/5.8.0/Qt3DQuick"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DQuick_OWN_INCLUDE_DIRS})
diff --git a/Qt53DQuickInput/Qt53DQuickInputConfig.cmake b/Qt53DQuickInput/Qt53DQuickInputConfig.cmake
index 06fe217..f935824 100644
--- a/Qt53DQuickInput/Qt53DQuickInputConfig.cmake
+++ b/Qt53DQuickInput/Qt53DQuickInputConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DQuickInput)
set(_Qt53DQuickInput_OWN_INCLUDE_DIRS "${_qt53DQuickInput_install_prefix}/include/" "${_qt53DQuickInput_install_prefix}/include/Qt3DQuickInput")
- set(Qt53DQuickInput_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DQuickInput_PRIVATE_INCLUDE_DIRS
+ "${_qt53DQuickInput_install_prefix}/include/Qt3DQuickInput/5.8.0"
+ "${_qt53DQuickInput_install_prefix}/include/Qt3DQuickInput/5.8.0/Qt3DQuickInput"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DQuickInput_OWN_INCLUDE_DIRS})
diff --git a/Qt53DQuickRender/Qt53DQuickRenderConfig.cmake b/Qt53DQuickRender/Qt53DQuickRenderConfig.cmake
index dd5472b..ef728fd 100644
--- a/Qt53DQuickRender/Qt53DQuickRenderConfig.cmake
+++ b/Qt53DQuickRender/Qt53DQuickRenderConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DQuickRender)
set(_Qt53DQuickRender_OWN_INCLUDE_DIRS "${_qt53DQuickRender_install_prefix}/include/" "${_qt53DQuickRender_install_prefix}/include/Qt3DQuickRender")
- set(Qt53DQuickRender_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DQuickRender_PRIVATE_INCLUDE_DIRS
+ "${_qt53DQuickRender_install_prefix}/include/Qt3DQuickRender/5.8.0"
+ "${_qt53DQuickRender_install_prefix}/include/Qt3DQuickRender/5.8.0/Qt3DQuickRender"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DQuickRender_OWN_INCLUDE_DIRS})
diff --git a/Qt53DRender/Qt53DRenderConfig.cmake b/Qt53DRender/Qt53DRenderConfig.cmake
index 70eff4b..271463b 100644
--- a/Qt53DRender/Qt53DRenderConfig.cmake
+++ b/Qt53DRender/Qt53DRenderConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::3DRender)
set(_Qt53DRender_OWN_INCLUDE_DIRS "${_qt53DRender_install_prefix}/include/" "${_qt53DRender_install_prefix}/include/Qt3DRender")
- set(Qt53DRender_PRIVATE_INCLUDE_DIRS "")
+ set(Qt53DRender_PRIVATE_INCLUDE_DIRS
+ "${_qt53DRender_install_prefix}/include/Qt3DRender/5.8.0"
+ "${_qt53DRender_install_prefix}/include/Qt3DRender/5.8.0/Qt3DRender"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt53DRender_OWN_INCLUDE_DIRS})
diff --git a/Qt5AxBase/Qt5AxBaseConfig.cmake b/Qt5AxBase/Qt5AxBaseConfig.cmake
index 48966d5..63afee8 100644
--- a/Qt5AxBase/Qt5AxBaseConfig.cmake
+++ b/Qt5AxBase/Qt5AxBaseConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::AxBase)
set(_Qt5AxBase_OWN_INCLUDE_DIRS "${_qt5AxBase_install_prefix}/include/" "${_qt5AxBase_install_prefix}/include/ActiveQt")
- set(Qt5AxBase_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5AxBase_PRIVATE_INCLUDE_DIRS
+ "${_qt5AxBase_install_prefix}/include/ActiveQt/5.8.0"
+ "${_qt5AxBase_install_prefix}/include/ActiveQt/5.8.0/ActiveQt"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5AxBase_OWN_INCLUDE_DIRS})
diff --git a/Qt5Bluetooth/Qt5BluetoothConfig.cmake b/Qt5Bluetooth/Qt5BluetoothConfig.cmake
index 9d2f7c4..1223caf 100644
--- a/Qt5Bluetooth/Qt5BluetoothConfig.cmake
+++ b/Qt5Bluetooth/Qt5BluetoothConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Bluetooth)
set(_Qt5Bluetooth_OWN_INCLUDE_DIRS "${_qt5Bluetooth_install_prefix}/include/" "${_qt5Bluetooth_install_prefix}/include/QtBluetooth")
- set(Qt5Bluetooth_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Bluetooth_PRIVATE_INCLUDE_DIRS
+ "${_qt5Bluetooth_install_prefix}/include/QtBluetooth/5.8.0"
+ "${_qt5Bluetooth_install_prefix}/include/QtBluetooth/5.8.0/QtBluetooth"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Bluetooth_OWN_INCLUDE_DIRS})
diff --git a/Qt5Charts/Qt5ChartsConfig.cmake b/Qt5Charts/Qt5ChartsConfig.cmake
index fef4b13..52e458d 100644
--- a/Qt5Charts/Qt5ChartsConfig.cmake
+++ b/Qt5Charts/Qt5ChartsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Charts)
set(_Qt5Charts_OWN_INCLUDE_DIRS "${_qt5Charts_install_prefix}/include/" "${_qt5Charts_install_prefix}/include/QtCharts")
- set(Qt5Charts_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Charts_PRIVATE_INCLUDE_DIRS
+ "${_qt5Charts_install_prefix}/include/QtCharts/5.8.0"
+ "${_qt5Charts_install_prefix}/include/QtCharts/5.8.0/QtCharts"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Charts_OWN_INCLUDE_DIRS})
diff --git a/Qt5Core/Qt5CoreConfig.cmake b/Qt5Core/Qt5CoreConfig.cmake
index 4232dc7..c35d103 100644
--- a/Qt5Core/Qt5CoreConfig.cmake
+++ b/Qt5Core/Qt5CoreConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Core)
set(_Qt5Core_OWN_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/" "${_qt5Core_install_prefix}/include/QtCore")
- set(Qt5Core_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Core_PRIVATE_INCLUDE_DIRS
+ "${_qt5Core_install_prefix}/include/QtCore/5.8.0"
+ "${_qt5Core_install_prefix}/include/QtCore/5.8.0/QtCore"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Core_OWN_INCLUDE_DIRS})
diff --git a/Qt5DBus/Qt5DBusConfig.cmake b/Qt5DBus/Qt5DBusConfig.cmake
index d5e3ac6..472b928 100644
--- a/Qt5DBus/Qt5DBusConfig.cmake
+++ b/Qt5DBus/Qt5DBusConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::DBus)
set(_Qt5DBus_OWN_INCLUDE_DIRS "${_qt5DBus_install_prefix}/include/" "${_qt5DBus_install_prefix}/include/QtDBus")
- set(Qt5DBus_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5DBus_PRIVATE_INCLUDE_DIRS
+ "${_qt5DBus_install_prefix}/include/QtDBus/5.8.0"
+ "${_qt5DBus_install_prefix}/include/QtDBus/5.8.0/QtDBus"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5DBus_OWN_INCLUDE_DIRS})
diff --git a/Qt5DataVisualization/Qt5DataVisualizationConfig.cmake b/Qt5DataVisualization/Qt5DataVisualizationConfig.cmake
index b518994..91559aa 100644
--- a/Qt5DataVisualization/Qt5DataVisualizationConfig.cmake
+++ b/Qt5DataVisualization/Qt5DataVisualizationConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::DataVisualization)
set(_Qt5DataVisualization_OWN_INCLUDE_DIRS "${_qt5DataVisualization_install_prefix}/include/" "${_qt5DataVisualization_install_prefix}/include/QtDataVisualization")
- set(Qt5DataVisualization_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5DataVisualization_PRIVATE_INCLUDE_DIRS
+ "${_qt5DataVisualization_install_prefix}/include/QtDataVisualization/5.8.0"
+ "${_qt5DataVisualization_install_prefix}/include/QtDataVisualization/5.8.0/QtDataVisualization"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5DataVisualization_OWN_INCLUDE_DIRS})
diff --git a/Qt5Designer/Qt5DesignerConfig.cmake b/Qt5Designer/Qt5DesignerConfig.cmake
index 69ea6dc..7b76032 100644
--- a/Qt5Designer/Qt5DesignerConfig.cmake
+++ b/Qt5Designer/Qt5DesignerConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Designer)
set(_Qt5Designer_OWN_INCLUDE_DIRS "${_qt5Designer_install_prefix}/include/" "${_qt5Designer_install_prefix}/include/QtDesigner")
- set(Qt5Designer_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Designer_PRIVATE_INCLUDE_DIRS
+ "${_qt5Designer_install_prefix}/include/QtDesigner/5.8.0"
+ "${_qt5Designer_install_prefix}/include/QtDesigner/5.8.0/QtDesigner"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Designer_OWN_INCLUDE_DIRS})
diff --git a/Qt5Gamepad/Qt5GamepadConfig.cmake b/Qt5Gamepad/Qt5GamepadConfig.cmake
index 66db87f..987ae8f 100644
--- a/Qt5Gamepad/Qt5GamepadConfig.cmake
+++ b/Qt5Gamepad/Qt5GamepadConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Gamepad)
set(_Qt5Gamepad_OWN_INCLUDE_DIRS "${_qt5Gamepad_install_prefix}/include/" "${_qt5Gamepad_install_prefix}/include/QtGamepad")
- set(Qt5Gamepad_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Gamepad_PRIVATE_INCLUDE_DIRS
+ "${_qt5Gamepad_install_prefix}/include/QtGamepad/5.8.0"
+ "${_qt5Gamepad_install_prefix}/include/QtGamepad/5.8.0/QtGamepad"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Gamepad_OWN_INCLUDE_DIRS})
diff --git a/Qt5Gui/Qt5GuiConfig.cmake b/Qt5Gui/Qt5GuiConfig.cmake
index 4718ba9..56888c1 100644
--- a/Qt5Gui/Qt5GuiConfig.cmake
+++ b/Qt5Gui/Qt5GuiConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Gui)
set(_Qt5Gui_OWN_INCLUDE_DIRS "${_qt5Gui_install_prefix}/include/" "${_qt5Gui_install_prefix}/include/QtGui")
- set(Qt5Gui_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Gui_PRIVATE_INCLUDE_DIRS
+ "${_qt5Gui_install_prefix}/include/QtGui/5.8.0"
+ "${_qt5Gui_install_prefix}/include/QtGui/5.8.0/QtGui"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Gui_OWN_INCLUDE_DIRS})
diff --git a/Qt5Help/Qt5HelpConfig.cmake b/Qt5Help/Qt5HelpConfig.cmake
index e84511c..0da7c20 100644
--- a/Qt5Help/Qt5HelpConfig.cmake
+++ b/Qt5Help/Qt5HelpConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Help)
set(_Qt5Help_OWN_INCLUDE_DIRS "${_qt5Help_install_prefix}/include/" "${_qt5Help_install_prefix}/include/QtHelp")
- set(Qt5Help_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Help_PRIVATE_INCLUDE_DIRS
+ "${_qt5Help_install_prefix}/include/QtHelp/5.8.0"
+ "${_qt5Help_install_prefix}/include/QtHelp/5.8.0/QtHelp"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Help_OWN_INCLUDE_DIRS})
diff --git a/Qt5Location/Qt5LocationConfig.cmake b/Qt5Location/Qt5LocationConfig.cmake
index a8bdf0a..f5348c2 100644
--- a/Qt5Location/Qt5LocationConfig.cmake
+++ b/Qt5Location/Qt5LocationConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Location)
set(_Qt5Location_OWN_INCLUDE_DIRS "${_qt5Location_install_prefix}/include/" "${_qt5Location_install_prefix}/include/QtLocation")
- set(Qt5Location_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Location_PRIVATE_INCLUDE_DIRS
+ "${_qt5Location_install_prefix}/include/QtLocation/5.8.0"
+ "${_qt5Location_install_prefix}/include/QtLocation/5.8.0/QtLocation"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Location_OWN_INCLUDE_DIRS})
diff --git a/Qt5Multimedia/Qt5MultimediaConfig.cmake b/Qt5Multimedia/Qt5MultimediaConfig.cmake
index 69f353f..67fa08b 100644
--- a/Qt5Multimedia/Qt5MultimediaConfig.cmake
+++ b/Qt5Multimedia/Qt5MultimediaConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Multimedia)
set(_Qt5Multimedia_OWN_INCLUDE_DIRS "${_qt5Multimedia_install_prefix}/include/" "${_qt5Multimedia_install_prefix}/include/QtMultimedia")
- set(Qt5Multimedia_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Multimedia_PRIVATE_INCLUDE_DIRS
+ "${_qt5Multimedia_install_prefix}/include/QtMultimedia/5.8.0"
+ "${_qt5Multimedia_install_prefix}/include/QtMultimedia/5.8.0/QtMultimedia"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Multimedia_OWN_INCLUDE_DIRS})
diff --git a/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake b/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
index 88162f8..1dcf69e 100644
--- a/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
+++ b/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::MultimediaWidgets)
set(_Qt5MultimediaWidgets_OWN_INCLUDE_DIRS "${_qt5MultimediaWidgets_install_prefix}/include/" "${_qt5MultimediaWidgets_install_prefix}/include/QtMultimediaWidgets")
- set(Qt5MultimediaWidgets_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5MultimediaWidgets_PRIVATE_INCLUDE_DIRS
+ "${_qt5MultimediaWidgets_install_prefix}/include/QtMultimediaWidgets/5.8.0"
+ "${_qt5MultimediaWidgets_install_prefix}/include/QtMultimediaWidgets/5.8.0/QtMultimediaWidgets"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5MultimediaWidgets_OWN_INCLUDE_DIRS})
diff --git a/Qt5Network/Qt5NetworkConfig.cmake b/Qt5Network/Qt5NetworkConfig.cmake
index 1778278..6a5d7f3 100644
--- a/Qt5Network/Qt5NetworkConfig.cmake
+++ b/Qt5Network/Qt5NetworkConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Network)
set(_Qt5Network_OWN_INCLUDE_DIRS "${_qt5Network_install_prefix}/include/" "${_qt5Network_install_prefix}/include/QtNetwork")
- set(Qt5Network_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Network_PRIVATE_INCLUDE_DIRS
+ "${_qt5Network_install_prefix}/include/QtNetwork/5.8.0"
+ "${_qt5Network_install_prefix}/include/QtNetwork/5.8.0/QtNetwork"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Network_OWN_INCLUDE_DIRS})
diff --git a/Qt5NetworkAuth/Qt5NetworkAuthConfig.cmake b/Qt5NetworkAuth/Qt5NetworkAuthConfig.cmake
index 50f56e0..821080c 100644
--- a/Qt5NetworkAuth/Qt5NetworkAuthConfig.cmake
+++ b/Qt5NetworkAuth/Qt5NetworkAuthConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::NetworkAuth)
set(_Qt5NetworkAuth_OWN_INCLUDE_DIRS "${_qt5NetworkAuth_install_prefix}/include/" "${_qt5NetworkAuth_install_prefix}/include/QtNetworkAuth")
- set(Qt5NetworkAuth_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5NetworkAuth_PRIVATE_INCLUDE_DIRS
+ "${_qt5NetworkAuth_install_prefix}/include/QtNetworkAuth/5.8.0"
+ "${_qt5NetworkAuth_install_prefix}/include/QtNetworkAuth/5.8.0/QtNetworkAuth"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5NetworkAuth_OWN_INCLUDE_DIRS})
diff --git a/Qt5Nfc/Qt5NfcConfig.cmake b/Qt5Nfc/Qt5NfcConfig.cmake
index 83ffddd..d8a5ba9 100644
--- a/Qt5Nfc/Qt5NfcConfig.cmake
+++ b/Qt5Nfc/Qt5NfcConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Nfc)
set(_Qt5Nfc_OWN_INCLUDE_DIRS "${_qt5Nfc_install_prefix}/include/" "${_qt5Nfc_install_prefix}/include/QtNfc")
- set(Qt5Nfc_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Nfc_PRIVATE_INCLUDE_DIRS
+ "${_qt5Nfc_install_prefix}/include/QtNfc/5.8.0"
+ "${_qt5Nfc_install_prefix}/include/QtNfc/5.8.0/QtNfc"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Nfc_OWN_INCLUDE_DIRS})
diff --git a/Qt5OpenGL/Qt5OpenGLConfig.cmake b/Qt5OpenGL/Qt5OpenGLConfig.cmake
index 6c874ac..3ac408a 100644
--- a/Qt5OpenGL/Qt5OpenGLConfig.cmake
+++ b/Qt5OpenGL/Qt5OpenGLConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::OpenGL)
set(_Qt5OpenGL_OWN_INCLUDE_DIRS "${_qt5OpenGL_install_prefix}/include/" "${_qt5OpenGL_install_prefix}/include/QtOpenGL")
- set(Qt5OpenGL_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5OpenGL_PRIVATE_INCLUDE_DIRS
+ "${_qt5OpenGL_install_prefix}/include/QtOpenGL/5.8.0"
+ "${_qt5OpenGL_install_prefix}/include/QtOpenGL/5.8.0/QtOpenGL"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5OpenGL_OWN_INCLUDE_DIRS})
diff --git a/Qt5Positioning/Qt5PositioningConfig.cmake b/Qt5Positioning/Qt5PositioningConfig.cmake
index 1aa3128..a6a2f24 100644
--- a/Qt5Positioning/Qt5PositioningConfig.cmake
+++ b/Qt5Positioning/Qt5PositioningConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Positioning)
set(_Qt5Positioning_OWN_INCLUDE_DIRS "${_qt5Positioning_install_prefix}/include/" "${_qt5Positioning_install_prefix}/include/QtPositioning")
- set(Qt5Positioning_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Positioning_PRIVATE_INCLUDE_DIRS
+ "${_qt5Positioning_install_prefix}/include/QtPositioning/5.8.0"
+ "${_qt5Positioning_install_prefix}/include/QtPositioning/5.8.0/QtPositioning"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Positioning_OWN_INCLUDE_DIRS})
diff --git a/Qt5PrintSupport/Qt5PrintSupportConfig.cmake b/Qt5PrintSupport/Qt5PrintSupportConfig.cmake
index d7c6765..9a24e99 100644
--- a/Qt5PrintSupport/Qt5PrintSupportConfig.cmake
+++ b/Qt5PrintSupport/Qt5PrintSupportConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::PrintSupport)
set(_Qt5PrintSupport_OWN_INCLUDE_DIRS "${_qt5PrintSupport_install_prefix}/include/" "${_qt5PrintSupport_install_prefix}/include/QtPrintSupport")
- set(Qt5PrintSupport_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5PrintSupport_PRIVATE_INCLUDE_DIRS
+ "${_qt5PrintSupport_install_prefix}/include/QtPrintSupport/5.8.0"
+ "${_qt5PrintSupport_install_prefix}/include/QtPrintSupport/5.8.0/QtPrintSupport"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5PrintSupport_OWN_INCLUDE_DIRS})
diff --git a/Qt5Purchasing/Qt5PurchasingConfig.cmake b/Qt5Purchasing/Qt5PurchasingConfig.cmake
index b0cf03d..d0b527d 100644
--- a/Qt5Purchasing/Qt5PurchasingConfig.cmake
+++ b/Qt5Purchasing/Qt5PurchasingConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Purchasing)
set(_Qt5Purchasing_OWN_INCLUDE_DIRS "${_qt5Purchasing_install_prefix}/include/" "${_qt5Purchasing_install_prefix}/include/QtPurchasing")
- set(Qt5Purchasing_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Purchasing_PRIVATE_INCLUDE_DIRS
+ "${_qt5Purchasing_install_prefix}/include/QtPurchasing/5.8.0"
+ "${_qt5Purchasing_install_prefix}/include/QtPurchasing/5.8.0/QtPurchasing"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Purchasing_OWN_INCLUDE_DIRS})
diff --git a/Qt5Qml/Qt5QmlConfig.cmake b/Qt5Qml/Qt5QmlConfig.cmake
index 966e3ff..c59d5d1 100644
--- a/Qt5Qml/Qt5QmlConfig.cmake
+++ b/Qt5Qml/Qt5QmlConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Qml)
set(_Qt5Qml_OWN_INCLUDE_DIRS "${_qt5Qml_install_prefix}/include/" "${_qt5Qml_install_prefix}/include/QtQml")
- set(Qt5Qml_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Qml_PRIVATE_INCLUDE_DIRS
+ "${_qt5Qml_install_prefix}/include/QtQml/5.8.0"
+ "${_qt5Qml_install_prefix}/include/QtQml/5.8.0/QtQml"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Qml_OWN_INCLUDE_DIRS})
diff --git a/Qt5Quick/Qt5QuickConfig.cmake b/Qt5Quick/Qt5QuickConfig.cmake
index e1e2d05..def9557 100644
--- a/Qt5Quick/Qt5QuickConfig.cmake
+++ b/Qt5Quick/Qt5QuickConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Quick)
set(_Qt5Quick_OWN_INCLUDE_DIRS "${_qt5Quick_install_prefix}/include/" "${_qt5Quick_install_prefix}/include/QtQuick")
- set(Qt5Quick_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Quick_PRIVATE_INCLUDE_DIRS
+ "${_qt5Quick_install_prefix}/include/QtQuick/5.8.0"
+ "${_qt5Quick_install_prefix}/include/QtQuick/5.8.0/QtQuick"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Quick_OWN_INCLUDE_DIRS})
diff --git a/Qt5QuickControls2/Qt5QuickControls2Config.cmake b/Qt5QuickControls2/Qt5QuickControls2Config.cmake
index cf34ce5..6f0ec96 100644
--- a/Qt5QuickControls2/Qt5QuickControls2Config.cmake
+++ b/Qt5QuickControls2/Qt5QuickControls2Config.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::QuickControls2)
set(_Qt5QuickControls2_OWN_INCLUDE_DIRS "${_qt5QuickControls2_install_prefix}/include/" "${_qt5QuickControls2_install_prefix}/include/QtQuickControls2")
- set(Qt5QuickControls2_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5QuickControls2_PRIVATE_INCLUDE_DIRS
+ "${_qt5QuickControls2_install_prefix}/include/QtQuickControls2/5.8.0"
+ "${_qt5QuickControls2_install_prefix}/include/QtQuickControls2/5.8.0/QtQuickControls2"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5QuickControls2_OWN_INCLUDE_DIRS})
diff --git a/Qt5QuickTest/Qt5QuickTestConfig.cmake b/Qt5QuickTest/Qt5QuickTestConfig.cmake
index 9b2b8b2..6e1ea1d 100644
--- a/Qt5QuickTest/Qt5QuickTestConfig.cmake
+++ b/Qt5QuickTest/Qt5QuickTestConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::QuickTest)
set(_Qt5QuickTest_OWN_INCLUDE_DIRS "${_qt5QuickTest_install_prefix}/include/" "${_qt5QuickTest_install_prefix}/include/QtQuickTest")
- set(Qt5QuickTest_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5QuickTest_PRIVATE_INCLUDE_DIRS
+ "${_qt5QuickTest_install_prefix}/include/QtQuickTest/5.8.0"
+ "${_qt5QuickTest_install_prefix}/include/QtQuickTest/5.8.0/QtQuickTest"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5QuickTest_OWN_INCLUDE_DIRS})
diff --git a/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake b/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
index b0b8988..559b2f0 100644
--- a/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
+++ b/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::QuickWidgets)
set(_Qt5QuickWidgets_OWN_INCLUDE_DIRS "${_qt5QuickWidgets_install_prefix}/include/" "${_qt5QuickWidgets_install_prefix}/include/QtQuickWidgets")
- set(Qt5QuickWidgets_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5QuickWidgets_PRIVATE_INCLUDE_DIRS
+ "${_qt5QuickWidgets_install_prefix}/include/QtQuickWidgets/5.8.0"
+ "${_qt5QuickWidgets_install_prefix}/include/QtQuickWidgets/5.8.0/QtQuickWidgets"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5QuickWidgets_OWN_INCLUDE_DIRS})
diff --git a/Qt5Script/Qt5ScriptConfig.cmake b/Qt5Script/Qt5ScriptConfig.cmake
index da053f8..b2b34d6 100644
--- a/Qt5Script/Qt5ScriptConfig.cmake
+++ b/Qt5Script/Qt5ScriptConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Script)
set(_Qt5Script_OWN_INCLUDE_DIRS "${_qt5Script_install_prefix}/include/" "${_qt5Script_install_prefix}/include/QtScript")
- set(Qt5Script_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Script_PRIVATE_INCLUDE_DIRS
+ "${_qt5Script_install_prefix}/include/QtScript/5.8.0"
+ "${_qt5Script_install_prefix}/include/QtScript/5.8.0/QtScript"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Script_OWN_INCLUDE_DIRS})
diff --git a/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake b/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
index e4bf959..959ac50 100644
--- a/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
+++ b/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::ScriptTools)
set(_Qt5ScriptTools_OWN_INCLUDE_DIRS "${_qt5ScriptTools_install_prefix}/include/" "${_qt5ScriptTools_install_prefix}/include/QtScriptTools")
- set(Qt5ScriptTools_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5ScriptTools_PRIVATE_INCLUDE_DIRS
+ "${_qt5ScriptTools_install_prefix}/include/QtScriptTools/5.8.0"
+ "${_qt5ScriptTools_install_prefix}/include/QtScriptTools/5.8.0/QtScriptTools"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5ScriptTools_OWN_INCLUDE_DIRS})
diff --git a/Qt5Scxml/Qt5ScxmlConfig.cmake b/Qt5Scxml/Qt5ScxmlConfig.cmake
index 90ac06b..e78c552 100644
--- a/Qt5Scxml/Qt5ScxmlConfig.cmake
+++ b/Qt5Scxml/Qt5ScxmlConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Scxml)
set(_Qt5Scxml_OWN_INCLUDE_DIRS "${_qt5Scxml_install_prefix}/include/" "${_qt5Scxml_install_prefix}/include/QtScxml")
- set(Qt5Scxml_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Scxml_PRIVATE_INCLUDE_DIRS
+ "${_qt5Scxml_install_prefix}/include/QtScxml/5.8.0"
+ "${_qt5Scxml_install_prefix}/include/QtScxml/5.8.0/QtScxml"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Scxml_OWN_INCLUDE_DIRS})
diff --git a/Qt5Sensors/Qt5SensorsConfig.cmake b/Qt5Sensors/Qt5SensorsConfig.cmake
index 9e53e4d..2096beb 100644
--- a/Qt5Sensors/Qt5SensorsConfig.cmake
+++ b/Qt5Sensors/Qt5SensorsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Sensors)
set(_Qt5Sensors_OWN_INCLUDE_DIRS "${_qt5Sensors_install_prefix}/include/" "${_qt5Sensors_install_prefix}/include/QtSensors")
- set(Qt5Sensors_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Sensors_PRIVATE_INCLUDE_DIRS
+ "${_qt5Sensors_install_prefix}/include/QtSensors/5.8.0"
+ "${_qt5Sensors_install_prefix}/include/QtSensors/5.8.0/QtSensors"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Sensors_OWN_INCLUDE_DIRS})
diff --git a/Qt5SerialBus/Qt5SerialBusConfig.cmake b/Qt5SerialBus/Qt5SerialBusConfig.cmake
index f2e4d69..8ba391c 100644
--- a/Qt5SerialBus/Qt5SerialBusConfig.cmake
+++ b/Qt5SerialBus/Qt5SerialBusConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::SerialBus)
set(_Qt5SerialBus_OWN_INCLUDE_DIRS "${_qt5SerialBus_install_prefix}/include/" "${_qt5SerialBus_install_prefix}/include/QtSerialBus")
- set(Qt5SerialBus_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5SerialBus_PRIVATE_INCLUDE_DIRS
+ "${_qt5SerialBus_install_prefix}/include/QtSerialBus/5.8.0"
+ "${_qt5SerialBus_install_prefix}/include/QtSerialBus/5.8.0/QtSerialBus"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5SerialBus_OWN_INCLUDE_DIRS})
diff --git a/Qt5SerialPort/Qt5SerialPortConfig.cmake b/Qt5SerialPort/Qt5SerialPortConfig.cmake
index fa15de5..4ec1024 100644
--- a/Qt5SerialPort/Qt5SerialPortConfig.cmake
+++ b/Qt5SerialPort/Qt5SerialPortConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::SerialPort)
set(_Qt5SerialPort_OWN_INCLUDE_DIRS "${_qt5SerialPort_install_prefix}/include/" "${_qt5SerialPort_install_prefix}/include/QtSerialPort")
- set(Qt5SerialPort_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5SerialPort_PRIVATE_INCLUDE_DIRS
+ "${_qt5SerialPort_install_prefix}/include/QtSerialPort/5.8.0"
+ "${_qt5SerialPort_install_prefix}/include/QtSerialPort/5.8.0/QtSerialPort"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5SerialPort_OWN_INCLUDE_DIRS})
diff --git a/Qt5Sql/Qt5SqlConfig.cmake b/Qt5Sql/Qt5SqlConfig.cmake
index 0e5d50c..baf3f66 100644
--- a/Qt5Sql/Qt5SqlConfig.cmake
+++ b/Qt5Sql/Qt5SqlConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Sql)
set(_Qt5Sql_OWN_INCLUDE_DIRS "${_qt5Sql_install_prefix}/include/" "${_qt5Sql_install_prefix}/include/QtSql")
- set(Qt5Sql_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Sql_PRIVATE_INCLUDE_DIRS
+ "${_qt5Sql_install_prefix}/include/QtSql/5.8.0"
+ "${_qt5Sql_install_prefix}/include/QtSql/5.8.0/QtSql"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Sql_OWN_INCLUDE_DIRS})
diff --git a/Qt5Svg/Qt5SvgConfig.cmake b/Qt5Svg/Qt5SvgConfig.cmake
index 5d6ad04..b0d1aaa 100644
--- a/Qt5Svg/Qt5SvgConfig.cmake
+++ b/Qt5Svg/Qt5SvgConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Svg)
set(_Qt5Svg_OWN_INCLUDE_DIRS "${_qt5Svg_install_prefix}/include/" "${_qt5Svg_install_prefix}/include/QtSvg")
- set(Qt5Svg_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Svg_PRIVATE_INCLUDE_DIRS
+ "${_qt5Svg_install_prefix}/include/QtSvg/5.8.0"
+ "${_qt5Svg_install_prefix}/include/QtSvg/5.8.0/QtSvg"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Svg_OWN_INCLUDE_DIRS})
diff --git a/Qt5Test/Qt5TestConfig.cmake b/Qt5Test/Qt5TestConfig.cmake
index 8183efd..f15979f 100644
--- a/Qt5Test/Qt5TestConfig.cmake
+++ b/Qt5Test/Qt5TestConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Test)
set(_Qt5Test_OWN_INCLUDE_DIRS "${_qt5Test_install_prefix}/include/" "${_qt5Test_install_prefix}/include/QtTest")
- set(Qt5Test_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Test_PRIVATE_INCLUDE_DIRS
+ "${_qt5Test_install_prefix}/include/QtTest/5.8.0"
+ "${_qt5Test_install_prefix}/include/QtTest/5.8.0/QtTest"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Test_OWN_INCLUDE_DIRS})
diff --git a/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake b/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake
index 2577e82..aa4bf39 100644
--- a/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake
+++ b/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::TextToSpeech)
set(_Qt5TextToSpeech_OWN_INCLUDE_DIRS "${_qt5TextToSpeech_install_prefix}/include/" "${_qt5TextToSpeech_install_prefix}/include/QtTextToSpeech")
- set(Qt5TextToSpeech_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5TextToSpeech_PRIVATE_INCLUDE_DIRS
+ "${_qt5TextToSpeech_install_prefix}/include/QtTextToSpeech/5.8.0"
+ "${_qt5TextToSpeech_install_prefix}/include/QtTextToSpeech/5.8.0/QtTextToSpeech"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5TextToSpeech_OWN_INCLUDE_DIRS})
diff --git a/Qt5UiTools/Qt5UiToolsConfig.cmake b/Qt5UiTools/Qt5UiToolsConfig.cmake
index f217198..1bfa8b2 100644
--- a/Qt5UiTools/Qt5UiToolsConfig.cmake
+++ b/Qt5UiTools/Qt5UiToolsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::UiTools)
set(_Qt5UiTools_OWN_INCLUDE_DIRS "${_qt5UiTools_install_prefix}/include/" "${_qt5UiTools_install_prefix}/include/QtUiTools")
- set(Qt5UiTools_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5UiTools_PRIVATE_INCLUDE_DIRS
+ "${_qt5UiTools_install_prefix}/include/QtUiTools/5.8.0"
+ "${_qt5UiTools_install_prefix}/include/QtUiTools/5.8.0/QtUiTools"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5UiTools_OWN_INCLUDE_DIRS})
diff --git a/Qt5WebChannel/Qt5WebChannelConfig.cmake b/Qt5WebChannel/Qt5WebChannelConfig.cmake
index ce8949c..c056b9d 100644
--- a/Qt5WebChannel/Qt5WebChannelConfig.cmake
+++ b/Qt5WebChannel/Qt5WebChannelConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::WebChannel)
set(_Qt5WebChannel_OWN_INCLUDE_DIRS "${_qt5WebChannel_install_prefix}/include/" "${_qt5WebChannel_install_prefix}/include/QtWebChannel")
- set(Qt5WebChannel_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5WebChannel_PRIVATE_INCLUDE_DIRS
+ "${_qt5WebChannel_install_prefix}/include/QtWebChannel/5.8.0"
+ "${_qt5WebChannel_install_prefix}/include/QtWebChannel/5.8.0/QtWebChannel"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5WebChannel_OWN_INCLUDE_DIRS})
diff --git a/Qt5WebSockets/Qt5WebSocketsConfig.cmake b/Qt5WebSockets/Qt5WebSocketsConfig.cmake
index c2609da..42e21b8 100644
--- a/Qt5WebSockets/Qt5WebSocketsConfig.cmake
+++ b/Qt5WebSockets/Qt5WebSocketsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::WebSockets)
set(_Qt5WebSockets_OWN_INCLUDE_DIRS "${_qt5WebSockets_install_prefix}/include/" "${_qt5WebSockets_install_prefix}/include/QtWebSockets")
- set(Qt5WebSockets_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5WebSockets_PRIVATE_INCLUDE_DIRS
+ "${_qt5WebSockets_install_prefix}/include/QtWebSockets/5.8.0"
+ "${_qt5WebSockets_install_prefix}/include/QtWebSockets/5.8.0/QtWebSockets"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5WebSockets_OWN_INCLUDE_DIRS})
diff --git a/Qt5Widgets/Qt5WidgetsConfig.cmake b/Qt5Widgets/Qt5WidgetsConfig.cmake
index 44c7aed..658e29a 100644
--- a/Qt5Widgets/Qt5WidgetsConfig.cmake
+++ b/Qt5Widgets/Qt5WidgetsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Widgets)
set(_Qt5Widgets_OWN_INCLUDE_DIRS "${_qt5Widgets_install_prefix}/include/" "${_qt5Widgets_install_prefix}/include/QtWidgets")
- set(Qt5Widgets_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Widgets_PRIVATE_INCLUDE_DIRS
+ "${_qt5Widgets_install_prefix}/include/QtWidgets/5.8.0"
+ "${_qt5Widgets_install_prefix}/include/QtWidgets/5.8.0/QtWidgets"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Widgets_OWN_INCLUDE_DIRS})
diff --git a/Qt5WinExtras/Qt5WinExtrasConfig.cmake b/Qt5WinExtras/Qt5WinExtrasConfig.cmake
index c63cee3..f9ea776 100644
--- a/Qt5WinExtras/Qt5WinExtrasConfig.cmake
+++ b/Qt5WinExtras/Qt5WinExtrasConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::WinExtras)
set(_Qt5WinExtras_OWN_INCLUDE_DIRS "${_qt5WinExtras_install_prefix}/include/" "${_qt5WinExtras_install_prefix}/include/QtWinExtras")
- set(Qt5WinExtras_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5WinExtras_PRIVATE_INCLUDE_DIRS
+ "${_qt5WinExtras_install_prefix}/include/QtWinExtras/5.8.0"
+ "${_qt5WinExtras_install_prefix}/include/QtWinExtras/5.8.0/QtWinExtras"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5WinExtras_OWN_INCLUDE_DIRS})
diff --git a/Qt5Xml/Qt5XmlConfig.cmake b/Qt5Xml/Qt5XmlConfig.cmake
index fee861c..31dc6f7 100644
--- a/Qt5Xml/Qt5XmlConfig.cmake
+++ b/Qt5Xml/Qt5XmlConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::Xml)
set(_Qt5Xml_OWN_INCLUDE_DIRS "${_qt5Xml_install_prefix}/include/" "${_qt5Xml_install_prefix}/include/QtXml")
- set(Qt5Xml_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5Xml_PRIVATE_INCLUDE_DIRS
+ "${_qt5Xml_install_prefix}/include/QtXml/5.8.0"
+ "${_qt5Xml_install_prefix}/include/QtXml/5.8.0/QtXml"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5Xml_OWN_INCLUDE_DIRS})
diff --git a/Qt5XmlPatterns/Qt5XmlPatternsConfig.cmake b/Qt5XmlPatterns/Qt5XmlPatternsConfig.cmake
index 662a612..45cfe8b 100644
--- a/Qt5XmlPatterns/Qt5XmlPatternsConfig.cmake
+++ b/Qt5XmlPatterns/Qt5XmlPatternsConfig.cmake
@@ -56,7 +56,10 @@ endmacro()
if (NOT TARGET Qt5::XmlPatterns)
set(_Qt5XmlPatterns_OWN_INCLUDE_DIRS "${_qt5XmlPatterns_install_prefix}/include/" "${_qt5XmlPatterns_install_prefix}/include/QtXmlPatterns")
- set(Qt5XmlPatterns_PRIVATE_INCLUDE_DIRS "")
+ set(Qt5XmlPatterns_PRIVATE_INCLUDE_DIRS
+ "${_qt5XmlPatterns_install_prefix}/include/QtXmlPatterns/5.8.0"
+ "${_qt5XmlPatterns_install_prefix}/include/QtXmlPatterns/5.8.0/QtXmlPatterns"
+ )
include("${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake" OPTIONAL)
foreach(_dir ${_Qt5XmlPatterns_OWN_INCLUDE_DIRS})

12
ports/qt5/portfile.cmake
View File

@ -1,6 +1,12 @@
include(${CMAKE_TRIPLET_FILE})
include(vcpkg_common_functions)
string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
if(BUILDTREES_PATH_LENGTH GREATER 27)
message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n"
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
)
endif()
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
include(configure_qt)
include(install_qt)
@ -56,6 +62,10 @@ configure_qt(
)
install_qt()
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_PACKAGES_DIR}/lib/cmake
PATCHES "${CMAKE_CURRENT_LIST_DIR}/add-private-header-paths.patch"
)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

2
ports/qwt/CONTROL
View File

@ -1,4 +1,4 @@
Source: qwt
Version: 6.1.3-1
Version: 6.1.3-2
Description: Qt widgets library for technical applications
Build-Depends: qt5

3
ports/qwt/portfile.cmake
View File

@ -21,6 +21,9 @@ else()
)
endif()
# The qwt build requires zlib1.dll
SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin")
vcpkg_configure_qmake(
SOURCE_PATH ${SOURCE_PATH}
)

3
ports/ragel/portfile.cmake
View File

@ -23,7 +23,8 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/ragel.txt)
# Allow empty include directory
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ragel)

9
ports/redshell/portfile.cmake
View File

@ -8,6 +8,15 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Error: redshell does not support UWP builds.")
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
message("Redshell only supports dynamic library linkage")
set(VCPKG_LIBRARY_LINKAGE "dynamic")
endif()
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "Redshell only supports dynamic CRT linkage")
endif()
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/redshell)
vcpkg_from_github(

5
ports/rttr/portfile.cmake
View File

@ -1,3 +1,8 @@
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
message("Rttr only supports dynamic library linkage")
set(VCPKG_LIBRARY_LINKAGE "dynamic")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rttr-0.9.5-src)
vcpkg_download_distfile(ARCHIVE

2
ports/sciter/CONTROL
View File

@ -1,4 +1,4 @@
Source: sciter
Version: 4.0.1.0
Version: 4.0.1.1
Description: Sciter is an embeddable HTML/CSS/scripting engine.
Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com

6
ports/sciter/portfile.cmake
View File

@ -12,9 +12,9 @@ include(vcpkg_common_functions)
# header-only library
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
set(SCITER_VERSION 4.0.1.0)
set(SCITER_REVISION 67d2939a0510886c036c7c41267603463cbf96e0)
set(SCITER_SHA adf77354cc8624892ac1daaf03cba56cf8c3f2d7f77426977011af2a3070f685f51fd594dfb58a7fc7421f3d8c418ba47afb6ceb00170c8623eefcedfe1dca82)
set(SCITER_VERSION 4.0.1.1)
set(SCITER_REVISION 5caaf6f5bd408fd45c30deb873ce76ae7af53819)
set(SCITER_SHA 88d332891a98fd80200ae04a7b5cc72a6edcbc123abe8147a17ac8e4189fbc4b7ed58f7acc06a6683ec3f1ed74e133115c35599751f6a31358b911e07b602ec4)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
set(SCITER_ARCH 64)

4
ports/suitesparse/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: suitesparse
Version: 4.5.5-1
Build-Depends: metis, clapack
Description: algebra library

16
ports/suitesparse/fix-install-suitesparse.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git "a/SuiteSparse/CMakeLists.txt" "b/SuiteSparse/CMakeLists.txt"
index 7361363..8a48cf3 100644
--- "a/SuiteSparse/CMakeLists.txt"
+++ "b/SuiteSparse/CMakeLists.txt"
@@ -10,7 +10,11 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug")
IF (BUILD_METIS)
INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include")
ELSE (BUILD_METIS)
+ IF(USE_VCPKG_METIS)
+ INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include")
+ ELSE (USE_VCPKG_METIS)
ADD_DEFINITIONS(-DNPARTITION)
+ ENDIF(USE_VCPKG_METIS)
ENDIF ( BUILD_METIS)
# Disable COMPLEX numbers: disable it by default, since it causes problems in some platforms.

105
ports/suitesparse/portfile.cmake Normal file
View File

@ -0,0 +1,105 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(STATUS "Warning: Dynamic building not supported yet. Building static.")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
set(SUITESPARSE_VER SuiteSparse-4.5.5) #if you change the version, becarefull of changing the SHA512 checksum accordingly
set(SUITESPARSEWIN_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-1.3.1)
set(SUITESPARSE_PATH ${SUITESPARSEWIN_PATH}/Suitesparse)
#download suitesparse libary
vcpkg_download_distfile(SUITESPARSE
URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/${SUITESPARSE_VER}.tar.gz"
FILENAME "${SUITESPARSE_VER}.tar.gz"
SHA512 4337c683027efca6c0800815587409db14db7d70df673451e307eb3ece5538815d06d90f3a831fa45071372f70b6f37eaa68fe951f69dbb52a5bfd84d2dc4913
)
#download suitesparse-metis-for-windows scripts, suitesparse does not have CMake build system, jlblancoc has made one for it
vcpkg_download_distfile(SUITESPARSEWIN
URLS "https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/v1.3.1.zip"
FILENAME "suitesparse-metis-for-windows-1.3.1.zip"
SHA512 f8b9377420432f1c0a05bf884fe9e72f1f4eaf7e05663c66a383b5d8ddbd4fbfaa7d433727b4dc3e66b41dbb96b1327d380b68a51a424276465512666e63393d
)
#extract suitesparse-metis-for-windows first and merge with suitesparse library
vcpkg_extract_source_archive(${SUITESPARSEWIN})
vcpkg_extract_source_archive(${SUITESPARSE} ${SUITESPARSEWIN_PATH})
vcpkg_apply_patches(
SOURCE_PATH ${SUITESPARSEWIN_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-suitesparse.patch"
)
vcpkg_configure_cmake(
SOURCE_PATH ${SUITESPARSEWIN_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_METIS=OFF #Disable the option to build metis from source
-DUSE_VCPKG_METIS=ON #Force using vcpckg metis library
-DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}
-DLIB_POSTFIX=
-DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON
-DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/openblas.lib
-DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/lapack.lib
OPTIONS_DEBUG
-DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug
OPTIONS_RELEASE
-DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}
)
vcpkg_install_cmake()
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/suitesparse/)
file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/SuiteSparse-config.cmake ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparse-config.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/SuiteSparse-config-release.cmake ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparse-config-release.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/cmake/SuiteSparse-config-debug.cmake ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparse-config-debug.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/UseSuiteSparse.cmake ${CURRENT_PACKAGES_DIR}/share/suitesparse/UseSuiteSparse.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/SuiteSparseConfig.cmake ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparseConfig.cmake)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/UseSuiteSparse.cmake)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/SuiteSparseConfig.cmake)
# Update paths in SuiteSparseConfig.cmake
file(READ ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparseConfig.cmake _contents)
string(REPLACE "set(SuiteSparse_LIB_POSTFIX \"64\")" "set(SuiteSparse_LIB_POSTFIX \"\")" _contents "${_contents}")
string(REPLACE "\#\# do nothing, it's OK" "include(${USE_SuiteSparse})" _contents "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparseConfig.cmake "${_contents}")
# Update paths in SuiteSparse-config.cmake
file(READ ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparse-config.cmake _contents)
string(REPLACE "get_filename_component(_IMPORT_PREFIX \"${_IMPORT_PREFIX}\" PATH)"
"get_filename_component(_IMPORT_PREFIX \"${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"${_IMPORT_PREFIX}\" PATH)" _contents "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparse-config.cmake "${_contents}")
# Update paths in SuiteSparse-config-debug.cmake
file(READ ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparse-config-debug.cmake _contents)
string(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/debug/lib/" _contents "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/suitesparse/SuiteSparse-config-debug.cmake "${_contents}")
#clean folders
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright of suitesparse and suitesparse-metis-for-windows
file(COPY ${SUITESPARSE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright)
file(COPY ${SUITESPARSEWIN_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright_suitesparse-metis-for-windows)

3
ports/sundials/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: sundials
Version: 2.7.0
Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)

49
ports/sundials/portfile.cmake Normal file
View File

@ -0,0 +1,49 @@
include(vcpkg_common_functions)
set(ARCHIVE_NAME "sundials-2.7.0")
set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME}")
vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://computation.llnl.gov/projects/sundials/download/${ARCHIVE_NAME}.tar.gz"
FILENAME "${ARCHIVE_NAME}.tar.gz"
SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DEXAMPLES_ENABLE=OFF
)
vcpkg_install_cmake(DISABLE_PARALLEL)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(GLOB REMOVE_DLLS
"${CURRENT_PACKAGES_DIR}/debug/lib/*.dll"
"${CURRENT_PACKAGES_DIR}/lib/*.dll"
)
file(GLOB DEBUG_DLLS
"${CURRENT_PACKAGES_DIR}/debug/lib/*.dll"
)
file(GLOB DLLS
"${CURRENT_PACKAGES_DIR}/lib/*.dll"
)
if(DLLS)
file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
endif()
if(DEBUG_DLLS)
file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sundials RENAME copyright)
if(REMOVE_DLLS)
file(REMOVE ${REMOVE_DLLS})
endif()
vcpkg_copy_pdbs()

3
ports/tacopie/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: tacopie
Version: 2.4.1
Description: Tacopie is a TCP Client & Server C++11 library

52
ports/tacopie/portfile.cmake Normal file
View File

@ -0,0 +1,52 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Cylix/tacopie
REF 2.4.1
SHA512 a1579080412114d3899492cd9559bb0eadd6048c1f84ac66ec8ca47bd6fbb35306f0d203d789bd1b7ed0a0a5ab27434dfe6583a1c67873c85bca4b6e2a186d77
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_build_cmake()
file(GLOB DLLS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
)
file(GLOB LIBS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/lib/*.lib"
)
file(GLOB DEBUG_DLLS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
)
file(GLOB DEBUG_LIBS
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/lib/*.lib"
)
file(GLOB HEADERS "${SOURCE_PATH}/includes/tacopie/*.hpp" "${SOURCE_PATH}/includes/tacopie/*.hpp")
if(DLLS)
file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
endif()
file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
if(DEBUG_DLLS)
file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/tacopie)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tacopie RENAME copyright)
vcpkg_copy_pdbs()

2
ports/taglib/CONTROL
View File

@ -1,4 +1,4 @@
Source: taglib
Version: 1.11.1-2
Version: 1.11.1-3
Description: TagLib Audio Meta-Data Library
Build-Depends: zlib

18
ports/taglib/dont-assume-latin-1.patch
View File

@ -1,18 +0,0 @@
diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp
index b267aaa..3db0521 100644
--- a/taglib/toolkit/tfilestream.cpp
+++ b/taglib/toolkit/tfilestream.cpp
@@ -54,7 +54,12 @@ namespace
if(!path.wstr().empty())
return CreateFile2(path.wstr().c_str(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL);
else if(!path.str().empty())
- return CreateFile2(std::wstring(path.str().cbegin(), path.str().end()).c_str(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL);
+ {
+ auto size = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, path.str().data(), path.str().size(), NULL, 0);
+ std::wstring tmp(size, L'\0');
+ MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, path.str().data(), path.str().size(), &tmp[0], tmp.size());
+ return CreateFile2(tmp.c_str(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL);
+ }
else
return InvalidFileHandle;
}

18
ports/taglib/portfile.cmake
View File

@ -1,29 +1,21 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/taglib-1.11.1)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taglib/taglib
REF v1.11.1
SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98
REF 662f340f933077a926de443c9882f483973570e3
SHA512 34087f77bb099f1f8ec82926a212a562bf589fc13f54eac50a56730c4411af2f4dbf1b7d09877087899048c3070325aea02297c6a94d0ad43fbf6742363dd2b6
HEAD_REF master
)
if(NOT VCPKG_USE_HEAD_VERSION) # these have been fixed upstream after 1.11.1
# patches for UWP
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/replace_non-uwp_functions.patch
${CMAKE_CURRENT_LIST_DIR}/dont-assume-latin-1.patch
)
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(WINRT_OPTIONS -DHAVE_VSNPRINTF=1 -DPLATFORM_WINRT=1)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DHAVE_VSNPRINTF=1 # taglib/ConfigureChecks.cmake doesn't properly detect MSVC vsnprintf() on UWP
OPTIONS ${WINRT_OPTIONS}
)
vcpkg_install_cmake()

29
ports/taglib/replace_non-uwp_functions.patch
View File

@ -1,29 +0,0 @@
diff --git a/taglib/toolkit/tfilestream.cpp b/taglib/toolkit/tfilestream.cpp
index 5205bae..b267aaa 100644
--- a/taglib/toolkit/tfilestream.cpp
+++ b/taglib/toolkit/tfilestream.cpp
@@ -52,9 +52,9 @@ namespace
const DWORD access = readOnly ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE);
if(!path.wstr().empty())
- return CreateFileW(path.wstr().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+ return CreateFile2(path.wstr().c_str(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL);
else if(!path.str().empty())
- return CreateFileA(path.str().c_str(), access, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+ return CreateFile2(std::wstring(path.str().cbegin(), path.str().end()).c_str(), access, FILE_SHARE_READ, OPEN_EXISTING, NULL);
else
return InvalidFileHandle;
}
@@ -437,9 +437,10 @@ long FileStream::length()
#ifdef _WIN32
SetLastError(NO_ERROR);
- const DWORD fileSize = GetFileSize(d->file, NULL);
+ LARGE_INTEGER fileSize;
+ GetFileSizeEx(d->file, &fileSize);
if(GetLastError() == NO_ERROR) {
- return static_cast<long>(fileSize);
+ return fileSize.QuadPart;
}
else {
debug("FileStream::length() -- Failed to get the file size.");

2
ports/tbb/CONTROL
View File

@ -1,3 +1,3 @@
Source: tbb
Version: 2017_U6
Version: 2017_U7
Description: Intel's Threading Building Blocks.

38
ports/tbb/portfile.cmake
View File

@ -2,16 +2,19 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(STATUS "Warning: Static building not supported yet. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
if (VCPKG_CRT_LINKAGE STREQUAL static OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Build settings not supported")
if (VCPKG_CRT_LINKAGE STREQUAL static)
message(FATAL_ERROR "TBB does not currently support static crt linkage")
endif()
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "TBB does not currently support UWP")
endif()
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO 01org/tbb
REF 2017_U6
SHA512 76b49fd085d8407b68b0f17e6eebfbcb7d2e6f9116bb5f6a00c6b4d59a55b16f9de79a2b9c9c3ece497b01810c33df21d0657893fd886db8bed639091ba97060
REF 2017_U7
SHA512 77fdd381eece8fb2fba4115af55d168e9d433bbdae3c21a53c35e7d5ed3397645fe75998ad10593b718f6959daaac05112401480cdb4fd2054f50b5f6f1a0df6
HEAD_REF tbb_2017)
if(TRIPLET_SYSTEM_ARCH STREQUAL x86)
@ -56,6 +59,33 @@ file(COPY
vcpkg_copy_pdbs()
# Since 2017_U7 TBB provides a CMake script to generate config file
include(${SOURCE_PATH}/cmake/TBBMakeConfig.cmake)
tbb_make_config(TBB_ROOT ${CURRENT_PACKAGES_DIR}
CONFIG_DIR TBB_CONFIG_DIR # is set to ${CURRENT_PACKAGES_DIR}/cmake
SYSTEM_NAME "Windows"
CONFIG_FOR_SOURCE
TBB_RELEASE_DIR "\${_tbb_root}/bin"
TBB_DEBUG_DIR "\${_tbb_root}/debug/bin")
file(COPY ${TBB_CONFIG_DIR}/TBBConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb)
file(COPY ${TBB_CONFIG_DIR}/TBBConfigVersion.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb)
file(REMOVE_RECURSE ${TBB_CONFIG_DIR})
# make it work with our installation layout
file(READ ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake TBB_CONFIG_CMAKE)
string(REPLACE
"get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)"
"get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)
get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" TBB_CONFIG_CMAKE "${TBB_CONFIG_CMAKE}")
string(REPLACE
"\${_tbb_root}/bin/\${_tbb_component}.lib"
"\${_tbb_root}/lib/\${_tbb_component}.lib" TBB_CONFIG_CMAKE "${TBB_CONFIG_CMAKE}")
string(REPLACE
"\${_tbb_root}/debug/bin/\${_tbb_component}_debug.lib"
"\${_tbb_root}/debug/lib/\${_tbb_component}_debug.lib" TBB_CONFIG_CMAKE "${TBB_CONFIG_CMAKE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${TBB_CONFIG_CMAKE}")
message(STATUS "Installing done")
# Handle copyright

4
ports/tiff/CONTROL
View File

@ -1,4 +1,4 @@
Source: tiff
Version: 4.0.7-1
Build-Depends: zlib, libjpeg-turbo, liblzma [windows], freeglut [windows]
Version: 4.0.8
Build-Depends: zlib, libjpeg-turbo, liblzma [windows]
Description: A library that supports the manipulation of TIFF image files

4
ports/tiff/portfile.cmake
View File

@ -1,7 +1,7 @@
include(vcpkg_common_functions)
set(LIBTIFF_VERSION 4.0.7)
set(LIBTIFF_HASH 941357bdd5f947cdca41a1d31ae14b3fadc174ae5dce7b7981dbe58f61995f575ac2e97a7cc4fcc435184012017bec0920278263490464644f2cdfad9a6c5ddc)
set(LIBTIFF_VERSION 4.0.8)
set(LIBTIFF_HASH 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tiff-${LIBTIFF_VERSION})
vcpkg_download_distfile(ARCHIVE

Some files were not shown because too many files have changed in this diff Show More