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

Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013

Browse Source 
# Conflicts:
#	scripts/cmake/vcpkg_configure_cmake.cmake
#	toolsrc/src/vcpkg/vcpkgpaths.cpp
This commit is contained in:
martin-s 2017-11-05 19:13:16 +01:00
commit d5a7da6bcb
326 changed files with 20671 additions and 2306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
CHANGELOG.md
View File

@ -1,3 +1,156 @@
vcpkg (0.0.96)
--------------
* Add ports:
- arb 2.11.1
- fdk-aac 2017-11-02-1e351
- flint 2.5.2
- itk 4.11.0
- libaiff 5.0
* Update ports:
- antlr4 4.6-1 -> 4.7
- apr 1.6.2-1 -> 1.6.3
- double-conversion 3.0.0-1 -> 3.0.0-2
- flann 1.9.1-6 -> 1.9.1-7
- opencv 3.3.1-4 -> 3.3.1-6
- protobuf 3.4.1-1 -> 3.4.1-2
* `vcpkg help`: Add help topics for commands. For example `vcpkg help install`
* `vcpkg` now downloads in a temp directory; after the download is complete, the file is moved to the destination. This avoids issues with hash mismatch on partially downloaded files.
* Update required version & auto-downloaded version of `cmake` to 3.9.5
* Update required version & auto-downloaded version of `vswhere` to 2.2.11
-- vcpkg team <vcpkg@microsoft.com> WED, 03 Nov 2017 18:45:00 -0800
vcpkg (0.0.95)
--------------
* Update ports:
- assimp 4.0.1 -> 4.0.1-2
- blaze 3.2-1 -> 3.2-2
- boost 1.65.1-2 -> 1.65.1-3
- catch 1.10.0 -> 1.11.0
- libharu 2017-08-15-d84867ebf9f-2 -> 2017-08-15-d84867ebf9f-4
- libsndfile libsndfile-1.0.29-6830c42-1 -> 1.0.29-6830c42-1
- opencv 3.3.1 -> 3.3.1-4
- pcl 1.8.1-2 -> 1.8.1-3
- poco 1.7.8-1 -> 1.7.8-2
- signalrclient 1.0.0-beta1-1 -> 1.0.0-beta1-2
- vtk 8.0.0-3 -> 8.0.1-1
- xlnt 1.1.0-1 -> 1.2.0-1
* Various improvements in `vcpkg` when obtaining data from `PowerShell` scripts. It should now be more robust
* Fix Windows 7 (i.e. `PowerShell 2.0`) issues in `PowerShell` scripts
* Fix an issue with `feature packages` where an installed package would appear to be uninstalled if a feature of the package was installed and then uninstalled
* Bump required version & auto-downloaded version of `git` to 2.5.0
-- vcpkg team <vcpkg@microsoft.com> WED, 01 Nov 2017 15:30:00 -0800
vcpkg (0.0.94)
--------------
* Add ports:
- capstone 3.0.5-rc3
- cgal 4.11
- gettimeofday 2017-10-14-2
- gmime 3.0.2
- leveldb 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73
- rpclib 2.2.0
* Update ports:
- alembic 1.7.1-4 -> 1.7.4
- blaze 3.2 -> 3.2-1
- boost 1.65.1-1 -> 1.65.1-2
- ceres 1.13.0-1 -> 1.13.0-2
- cpprestsdk 2.9.0-4 -> 2.10.0
- cppwinrt spring_2017_creators_update_for_vs_15.3 -> fall_2017_creators_update_for_vs_15.3-2
- cppzmq 4.2.1 -> 4.2.2
- eigen3 3.3.4-1 -> 3.3.4-2
- gdcm2 2.6.8-1 -> 2.8.3
- harfbuzz 1.4.6-2 -> 1.6.3-1
- libjpeg-turbo 1.5.2-1 -> 1.5.2-2
- libmariadb 2.3.2-1 -> 3.0.2
- libmysql 5.7.17-2 -> 5.7.17-3
- live555 2017.06.04-1 -> 2017.09.12
- mpir 3.0.0-2 -> 3.0.0-3
- opencv 3.3.0-4 -> 3.3.1
- pangolin 0.5-2 -> 0.5-3
- pugixml 1.8.1-1 -> 1.8.1-2
- secp256k1 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4 -> 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-1
- smpeg2 2.0.0-2 -> 2.0.0-3
- sqlite3 3.20.1 -> 3.21.0
* Bump required version & auto-downloaded version of `git` to 2.4.3
-- vcpkg team <vcpkg@microsoft.com> FRI, 27 Oct 2017 19:30:00 -0800
vcpkg (0.0.93)
--------------
* Add ports:
- berkeleydb 4.8.30
- libsodium 1.0.15
- secp256k1 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4
* Update ports:
- assimp 4.0.0-2 -> 4.0.1
- azure-storage-cpp 3.0.0-3 -> 3.0.0-4
- cctz v2.1 -> 2.1
- folly v2017.07.17.01-1 -> 2017.10.02.00
- grpc 1.6.0-1 -> 1.6.0-2
- openblas v0.2.20-2 -> 0.2.20-2
- pthreads 2.9.1-1 -> 2.9.1-2
- sdl2-gfx 1.0.3-2 -> 1.0.3-3
- sdl2-image 2.0.1-2 -> 2.0.1-3
- sdl2-mixer 2.0.1-2 -> 2.0.1-3
- sdl2-net 2.0.1-2 -> 2.0.1-3
- sdl2-ttf 2.0.14-2 -> 2.0.14-3
- spirv-tools v2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1 -> 2017.1-dev-7e2d26c77b606b21af839b37fd21381c4a669f23-1
- thor v2.0-1 -> 2.0-1
- tinyexr v0.9.5-d16ea6 -> 0.9.5-d16ea6
* Fix issue where `vcpkg` was getting output from powershell scripts. Powershell adds newlines when the console width is reached; the extra newlines was causing `vcpkg`'s parsing to fail.
* Improve autocomplete/tab-completion for powershell (still experimental)
-- vcpkg team <vcpkg@microsoft.com> THU, 19 Oct 2017 21:30:00 -0800
vcpkg (0.0.92)
--------------
* Add ports:
- cctz v2.1
- celero 2.1.0-1
- eastl 3.05.08
- imgui 1.51-1
- libidn2 2.0.4
- mozjpeg 3.2-1
- spatialite-tools 4.3.0
- string-theory 1.6
- tiny-dnn 2017-10-09-dd906fed8c8aff8dc837657c42f9d55f8b793b0e
- wincrypt 0.0
- winsock2 0.0
* Update ports:
- abseil 2017-09-28 -> 2017-10-14
- boost 1.65.1 -> 1.65.1-1
- cpprestsdk 2.9.0-3 -> 2.9.0-4
- gdal 1.11.3-5 -> 2.2.2
- jansson v2.10-1 -> 2.10-1
- lua 5.3.4-2 -> 5.3.4-4
- mpfr 3.1.5-1 -> 3.1.6
- ogre 1.9.0 -1 -> 1.9.0-1
- openni2 2.2.0.33-2 -> 2.2.0.33-4
- pcl 1.8.1-1 -> 1.8.1-2
- sciter 4.0.3 -> 4.0.4
- vtk 8.0.0-2 -> 8.0.0-3
- websocketpp 0.7.0 -> 0.7.0-1
* Initial support for autocomplete/tab-completion for powershell (still experimental)
* Add `VCPKG_CHAINLOAD_TOOLCHAIN_FILE variable`. As the name suggests, you can chainload your own toolchain file along with the `vcpkg` toolchain file.
* Fix issues with the new Visual Studio detection ([`vswhere.exe`](https://github.com/Microsoft/vswhere)). Notably:
- Detect VS2015 BuildTools, VS2017 BuildTools and VS Express Edition
* Fix issues with Windows SDK detection
* Rework acquisition of `vcpkg` dependencies (e.g. `cmake`, `git`). It is now more robust and should be faster on modern Operating Systems while still having fallback functions for older ones.
* Bump required version & auto-downloaded version of `cmake` to 3.9.4
* Bump required version & auto-downloaded version of `nuget` to 4.4.0
* Bump required version & auto-downloaded version of `vswhere` to 2.2.7
* Bump required version & auto-downloaded version of `git` to 2.4.2(.3)
* Bump ninja to version 1.8.0
-- vcpkg team <vcpkg@microsoft.com> TUE, 17 Oct 2017 16:00:00 -0800
vcpkg (0.0.91)
--------------
* Add ports:

2
README.md
View File

@ -10,7 +10,7 @@ Prerequisites:
- Windows 10, 8.1, or 7
- Visual Studio 2017 or Visual Studio 2015 Update 3
- Git
- *Optional: CMake 3.9.1*
- *Optional: CMake 3.9.5*
Clone this repository, then run
```

2
docs/about/faq.md
View File

@ -78,7 +78,7 @@ Vcpkg uses CMake internally as a build scripting language. This is because CMake
## Will Vcpkg support downloading compiled binaries from a public or private server?
We would like to eventually support downloading precompiled binaries, similar to other system package managers.
In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See [the `export` command](../users/integration.md#export).
In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export`](../users/integration.md#export) command.
## What Visual C++ toolsets are supported?
We support Visual Studio 2015 Update 3 and above.

12
ports/abseil/fix-intrin.patch
View File

@ -1,12 +0,0 @@
diff --git a/absl/base/optimization.h b/absl/base/optimization.h
index db8beaf..aaaffa4 100644
--- a/absl/base/optimization.h
+++ b/absl/base/optimization.h
@@ -46,6 +46,7 @@
// GCC will not tail call given inline volatile assembly.
#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
#elif defined(_MSC_VER)
+#include <intrin.h>
// The __nop() intrinsic blocks the optimisation.
#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __nop()
#else

5
ports/abseil/portfile.cmake
View File

@ -15,11 +15,6 @@ vcpkg_from_github(
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-intrin.patch"
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(

65
ports/alac/CMakeLists.txt Normal file
View File

@ -0,0 +1,65 @@
cmake_minimum_required (VERSION 3.9)
project (alac)
set(HEADERS
codec/EndianPortable.h
codec/aglib.h
codec/ALACAudioTypes.h
codec/ALACBitUtilities.h
codec/ALACDecoder.h
codec/ALACEncoder.h
codec/dplib.h
codec/matrixlib.h
)
set (SRCS
codec/EndianPortable.c
codec/ALACBitUtilities.c
codec/ALACDecoder.cpp
codec/ALACEncoder.cpp
codec/ag_dec.c
codec/ag_enc.c
codec/dp_dec.c
codec/dp_enc.c
codec/matrix_dec.c
codec/matrix_enc.c
)
set(EXE_SRCS
convert-utility/main.cpp
convert-utility/CAFFileALAC.cpp
)
if(MSVC)
add_compile_options(/W4 -D_CRT_SECURE_NO_WARNINGS -DTARGET_OS_WIN32)
endif()
if(BUILD_SHARED_LIBS)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif()
include_directories(. codec convert-utility)
add_library(libalac ${SRCS})
add_executable(alacconvert ${EXE_SRCS})
target_link_libraries(alacconvert libalac)
install(
TARGETS libalac
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(NOT DISABLE_INSTALL_TOOLS)
install (
TARGETS alacconvert
RUNTIME DESTINATION tools/alac
)
endif()
if(NOT DISABLE_INSTALL_HEADERS)
install(FILES ${HEADERS} DESTINATION include/alac)
endif()

3
ports/alac/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: alac
Version: 2017-11-03-c38887c5
Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.

21
ports/alac/portfile.cmake Normal file
View File

@ -0,0 +1,21 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO macosforge/alac
REF c38887c5c5e64a4b31108733bd79ca9b2496d987
SHA512 8da18df25807e76f9187f7bf30585aace303d55444f0a614ab00d98d11caca3fdc5c6f5b9fd11e5f4c92a2ab1e86fef73deeeada57e9d49951fea8b80ba383cc
HEAD_REF master
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac RENAME copyright)

2
ports/alembic/CONTROL
View File

@ -1,4 +1,4 @@
Source: alembic
Version: 1.7.1-4
Version: 1.7.4
Build-Depends: ilmbase, hdf5
Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. http://alembic.io/

4
ports/alembic/portfile.cmake
View File

@ -8,8 +8,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alembic/alembic
REF 1.7.1
SHA512 89e30b681a76eaf79b20ebeff62c495971b0eb64b28f249a14bbcf3bdb40df7eda93b0ede299dd5511bd4587a2cc2d4ebd851fb89bf999fdccc31fee3cffbba2
REF 1.7.4
SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0
HEAD_REF master
)

2
ports/antlr4/CONTROL
View File

@ -1,3 +1,3 @@
Source: antlr4
Version: 4.6-1
Version: 4.7
Description: ANother Tool for Language Recognition

6
ports/antlr4/portfile.cmake
View File

@ -1,12 +1,12 @@
include(vcpkg_common_functions)
set(VERSION 4.6)
set(VERSION 4.7)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/runtime)
vcpkg_download_distfile(ARCHIVE
URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.6-source.zip"
URLS "http://www.antlr.org/download/antlr4-cpp-runtime-4.7-source.zip"
FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip"
SHA512 e123c2227e41ce80da5a3758725a018690ed70a4e10c23da26c966259e6bdafa192f4363f5a7e1181ef9a47bf3cc50d6b0ca7b26c8dd2b19222a7edf54de8de2
SHA512 a14fd3320537075a8d4c1cfa81d416bad6257d238608e2428f4930495072cce984c707126e3777ffd3849dd6b6cdf1bf43624bd6d318b1fa5dd6749a7304f808
)
# license not exist in antlr folder.

16
ports/antlr4/static.patch
View File

@ -1,12 +1,12 @@
diff --git a/antlr4-common.h b/antlr4-common.h
index 197fd6d..34a62c8 100644
index ce45e9e..3162795 100644
--- a/antlr4-common.h
+++ b/antlr4-common.h
@@ -34,6 +34,7 @@
#include <bitset>
#include <condition_variable>
@@ -48,6 +48,7 @@
#endif
+#define ANTLR4CPP_STATIC
// Defines for the Guid class and other platform dependent stuff.
#ifdef _WIN32
#pragma warning (disable: 4250) // Class inherits by dominance.
#define GUID_WINDOWS
+ #define ANTLR4CPP_STATIC
#ifdef _WIN64
typedef __int64 ssize_t;

2
ports/apr/CONTROL
View File

@ -1,3 +1,3 @@
Source: apr
Version: 1.6.2-1
Version: 1.6.3
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.

11
ports/apr/portfile.cmake
View File

@ -7,11 +7,14 @@
#
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-1.6.2)
set(VERSION 1.6.3)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-${VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://www.apache.org/dist/apr/apr-1.6.2.tar.bz2"
FILENAME "apr-1.6.2.tar.bz2"
SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
URLS "https://www.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
FILENAME "apr-${VERSION}.tar.bz2"
SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
)
vcpkg_extract_source_archive(${ARCHIVE})

94
ports/arb/CMakeLists.txt Normal file
View File

@ -0,0 +1,94 @@
cmake_minimum_required(VERSION 2.8.12)
project(arb C)
set (DEPS mpir mpfr pthreads flint2 gettimeofday)
set (mpir_lib gmp mpir)
set (mpfr_lib mpfr)
set (pthreads_lib pthreads pthread)
set (flint2_lib ${LIBRARY_TYPE}_flint flint)
set (gettimeofday_lib gettimeofday)
set (mpir_header gmp.h)
set (mpfr_header mpfr.h)
set (pthreads_header pthread.h)
set (flint2_header flint/flint.h)
set (gettimeofday_header gettimeofday.h)
foreach (LIB ${DEPS})
string (TOUPPER ${LIB} LIB_UPPER)
find_library(${LIB_UPPER}_LIBRARY NAMES ${${LIB}_lib})
if (NOT ${LIB_UPPER}_LIBRARY)
message(FATAL_ERROR "${LIB} library not found.")
endif()
add_library(${LIB} UNKNOWN IMPORTED)
set_property(TARGET ${LIB} PROPERTY IMPORTED_LOCATION ${${LIB_UPPER}_LIBRARY})
message("${LIB} found in ${${LIB_UPPER}_LIBRARY}")
endforeach ()
foreach (LIB ${DEPS})
string(TOUPPER ${LIB} HEADER_PKG)
set (HEADER ${${LIB}_header})
find_path(${HEADER_PKG}_INCLUDE_DIR NAMES ${HEADER})
if (NOT ${HEADER_PKG}_INCLUDE_DIR)
message(FATAL_ERROR "${HEADER} header not found.")
endif()
message("${HEADER} found in ${${HEADER_PKG}_INCLUDE_DIR}")
set (DEP_INCLUDE_DIRS ${DEP_INCLUDE_DIRS} ${${HEADER_PKG}_INCLUDE_DIR})
endforeach ()
file(GLOB TEMP "*.h")
foreach (TEMP_H ${TEMP})
get_filename_component(FOLDER ${TEMP_H} NAME_WE)
set(FOLDERS ${FOLDERS} ${FOLDER})
endforeach()
foreach (FOLDER ${FOLDERS})
file(GLOB TEMP "${FOLDER}/*.c")
set(SRC ${SRC} ${TEMP})
endforeach ()
include_directories(BEFORE ${arb_SOURCE_DIR})
include_directories(BEFORE ${DEP_INCLUDE_DIRS})
add_library(arb ${SRC})
target_compile_definitions(arb PRIVATE HAVE_TLS=1 FLINT_REENTRANT=0)
if (BUILD_SHARED_LIBS)
target_compile_definitions(arb PRIVATE MSC_USE_DLL)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS yes)
MESSAGE( STATUS "Building shared libraries" )
else ()
target_compile_definitions(arb PRIVATE PTW32_STATIC_LIB)
MESSAGE( STATUS "Building static libraries" )
endif()
target_compile_definitions(arb PRIVATE "ARB_BUILD_DLL")
target_link_libraries(arb ${DEPS})
install(TARGETS arb
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
foreach (FOLDER ${FOLDERS})
set(HEADERS ${HEADERS} ${FOLDER}.h)
endforeach ()
install(FILES ${HEADERS} DESTINATION include)
if (BUILD_TESTS)
enable_testing()
foreach (FOLDER ${FOLDERS})
file(GLOB TEMP "${FOLDER}/test/*.c")
foreach (TEST_SOURCE ${TEMP})
get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
add_executable(${FOLDER}-${TEST_NAME} ${TEST_SOURCE})
target_link_libraries(${FOLDER}-${TEST_NAME} arb)
add_test(${FOLDER}-${TEST_NAME} ${FOLDER}-${TEST_NAME})
endforeach ()
endforeach ()
endif ()

4
ports/arb/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: arb
Version: 2.11.1
Description: a C library for arbitrary-precision interval arithmetic
Build-Depends: flint

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

@ -0,0 +1,32 @@
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(STATUS "Warning: Dynamic building not supported yet. Building static.")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/arb-2.11.1)
vcpkg_from_github(
OUT_SOURCE_PATH ${SOURCE_PATH}
REPO fredrik-johansson/arb
REF 2.11.1
SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353
HEAD_REF master
)
file(REMOVE ${SOURCE_PATH}/CMakeLists.txt)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/arb RENAME copyright)
# Remove duplicate headers
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

2
ports/assimp/CONTROL
View File

@ -1,4 +1,4 @@
Source: assimp
Version: 4.0.0-2
Version: 4.0.1-3
Description: The Open Asset import library
Build-Depends: zlib

12
ports/assimp/dont-overwrite-prefix-path.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d781d1f..0d64d50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,6 @@ if (WIN32)
endif()
IF(MSVC)
- set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
OPTION( ASSIMP_INSTALL_PDB
"Install MSVC debug files."
ON

23
ports/assimp/portfile.cmake
View File

@ -3,22 +3,29 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO assimp/assimp
REF v4.0.0
SHA512 ab2b376c6323fc8579fe3a4b3dbe92c44d753747464a14d6e2be70d2a855c208df882ad84487a7b96f364afb175938b5f6a1111d767450b01e0b8b7f0f36ba62
REF v4.0.1
SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/const-compare-worditerator.patch
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/const-compare-worditerator.patch"
"${CMAKE_CURRENT_LIST_DIR}/dont-overwrite-prefix-path.patch"
)
file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake)
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DASSIMP_BUILD_TESTS=False
-DASSIMP_BUILD_ASSIMP_VIEW=False
-DASSIMP_BUILD_ZLIB=False
-DASSIMP_BUILD_ASSIMP_TOOLS=False
OPTIONS -DASSIMP_BUILD_TESTS=OFF
-DASSIMP_BUILD_ASSIMP_VIEW=OFF
-DASSIMP_BUILD_ZLIB=OFF
-DASSIMP_BUILD_ASSIMP_TOOLS=OFF
-DASSIMP_INSTALL_PDB=OFF
)
vcpkg_install_cmake()
@ -28,8 +35,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.0")
vcpkg_copy_pdbs()
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG)

4
ports/atkmm/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: atkmm
Version: 2.24.2
Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
Build-Depends: glib, gettext, atk, glibmm

510
ports/atkmm/COPYING Normal file
View File

@ -0,0 +1,510 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations
below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it
becomes a de-facto standard. To achieve this, non-free programs must
be allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control
compilation and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at least
three years, to give the same user the materials specified in
Subsection 6a, above, for a charge no more than the cost of
performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply, and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License
may add an explicit geographical distribution limitation excluding those
countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms
of the ordinary General Public License).
To apply these terms, attach the following notices to the library.
It is safest to attach them to the start of each source file to most
effectively convey the exclusion of warranty; and each file should
have at least the "copyright" line and a pointer to where the full
notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or
your school, if any, to sign a "copyright disclaimer" for the library,
if necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James
Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!

2
ports/atkmm/README Normal file
View File

@ -0,0 +1,2 @@
atkmm is the C++ binding for the ATK library.
This module is part of the GNOME C++ bindings effort <http://www.gtkmm.org/>.

98
ports/atkmm/fix_charset.patch Normal file
View File

@ -0,0 +1,98 @@
diff --git a/MSVC_Net2013/atkmm.vcxproj b/MSVC_Net2013/atkmm.vcxproj
index 40f21cb..e9f5c5e 100644
--- a/MSVC_Net2013/atkmm.vcxproj
+++ b/MSVC_Net2013/atkmm.vcxproj
@@ -22,21 +22,22 @@
<ProjectName>atkmm</ProjectName>
<ProjectGuid>{9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj
index d6f2798..aab7023 100644
--- a/MSVC_Net2013/gendef.vcxproj
+++ b/MSVC_Net2013/gendef.vcxproj
@@ -21,21 +21,22 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2013/install.vcxproj
index 6225a66..7f61dc5 100644
--- a/MSVC_Net2013/install.vcxproj
+++ b/MSVC_Net2013/install.vcxproj
@@ -22,28 +22,29 @@
<ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
<RootNamespace>install</RootNamespace>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

306
ports/atkmm/fix_properties.patch Normal file
View File

@ -0,0 +1,306 @@
diff --git a/MSVC_Net2013/atkmm-build-defines.props b/MSVC_Net2013/atkmm-build-defines.props
index 421f5c3..0275e6e 100644
--- a/MSVC_Net2013/atkmm-build-defines.props
+++ b/MSVC_Net2013/atkmm-build-defines.props
@@ -5,8 +5,6 @@
</ImportGroup>
<PropertyGroup Label="UserMacros">
<AtkMMBuildDefs>ATKMM_BUILD</AtkMMBuildDefs>
- <CPPDepLibsRelease>glibmm-vc$(VSVer)0-2_4.lib;sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease>
- <CPPDepLibsDebug>glibmm-vc$(VSVer)0-d-2_4.lib;sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>panogmmbuilddefinesprops</_PropertySheetDisplayName>
@@ -15,25 +13,19 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>.\atkmm;..\atk;$(GlibEtcInstallRoot)\include\glibmm-2.4;$(GlibEtcInstallRoot)\lib\glibmm-2.4\include;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\atkmm;..\atk;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>atk-1.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<BuildMacro Include="AtkMMBuildDefs">
<Value>$(AtkMMBuildDefs)</Value>
</BuildMacro>
- <BuildMacro Include="CPPDepLibsRelease">
- <Value>$(CPPDepLibsRelease)</Value>
- </BuildMacro>
- <BuildMacro Include="CPPDepLibsDebug">
- <Value>$(CPPDepLibsDebug)</Value>
- </BuildMacro>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2013/atkmm-version-paths.props b/MSVC_Net2013/atkmm-version-paths.props
index affd50f..675aa3e 100644
--- a/MSVC_Net2013/atkmm-version-paths.props
+++ b/MSVC_Net2013/atkmm-version-paths.props
@@ -2,13 +2,9 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<VSVer>12</VSVer>
- <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
- <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
<ApiMajorVersion>1</ApiMajorVersion>
<ApiMinorVersion>6</ApiMinorVersion>
- <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix>
- <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>atkmmversionpathsprops</_PropertySheetDisplayName>
@@ -17,12 +13,6 @@
<BuildMacro Include="VSVer">
<Value>$(VSVer)</Value>
</BuildMacro>
- <BuildMacro Include="GlibEtcInstallRoot">
- <Value>$(GlibEtcInstallRoot)</Value>
- </BuildMacro>
- <BuildMacro Include="CopyDir">
- <Value>$(CopyDir)</Value>
- </BuildMacro>
<BuildMacro Include="DefDir">
<Value>$(DefDir)</Value>
</BuildMacro>
@@ -32,11 +22,5 @@
<BuildMacro Include="ApiMinorVersion">
<Value>$(ApiMinorVersion)</Value>
</BuildMacro>
- <BuildMacro Include="ReleaseDllSuffix">
- <Value>$(ReleaseDllSuffix)</Value>
- </BuildMacro>
- <BuildMacro Include="DebugDllSuffix">
- <Value>$(DebugDllSuffix)</Value>
- </BuildMacro>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2013/atkmm.vcxproj b/MSVC_Net2013/atkmm.vcxproj
index c3db50a..40f21cb 100644
--- a/MSVC_Net2013/atkmm.vcxproj
+++ b/MSVC_Net2013/atkmm.vcxproj
@@ -41,7 +41,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/MSVC_Net2013/atkmm.vcxproj.filters b/MSVC_Net2013/atkmm.vcxproj.filters
index f0fca22..6598996 100644
--- a/MSVC_Net2013/atkmm.vcxproj.filters
+++ b/MSVC_Net2013/atkmm.vcxproj.filters
@@ -15,55 +15,143 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\atk\atkmm\action.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\component.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\document.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\editabletext.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\hyperlink.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\hypertext.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\image.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\implementor.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\init.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\noopobject.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\object.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\objectaccessible.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\range.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\relation.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\relationset.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\selection.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\stateset.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\streamablecontent.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\table.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\text.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\value.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\atk\atkmm\wrap_init.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\atk\atkmm\action.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\component.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\document.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\editabletext.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\hyperlink.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\hypertext.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\image.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\implementor.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\init.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\noopobject.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\object.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\objectaccessible.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\range.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\relation.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\relationset.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\selection.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\stateset.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\streamablecontent.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\table.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\text.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\value.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\atk\atkmm\wrap_init.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\atk\atkmm\action.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\component.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\document.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\editabletext.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\hyperlink.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\hypertext.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\image.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\implementor.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\init.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\noopobject.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\object.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\objectaccessible.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\range.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\relation.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\relationset.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\selection.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\stateset.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\streamablecontent.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\table.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\text.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\value.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\atk\atkmm\wrap_init.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\atk\atkmm\action.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\component.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\document.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\editabletext.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\hyperlink.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\hypertext.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\image.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\implementor.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\init.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\noopobject.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\object.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\objectaccessible.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\range.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\relation.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\relationset.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\selection.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\stateset.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\streamablecontent.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\table.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\text.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\value.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\atk\atkmm\wrap_init.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="atkmm.rc">
+ <ResourceCompile Include=".\atkmm\atkmm.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2013/gendef.vcxproj
index 554054c..d6f2798 100644
--- a/MSVC_Net2013/gendef.vcxproj
+++ b/MSVC_Net2013/gendef.vcxproj
@@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

34
ports/atkmm/msvc_recommended_pragmas.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef _MSC_VER
#pragma error "This header is for Microsoft VC only."
#endif /* _MSC_VER */
/* Make MSVC more pedantic, this is a recommended pragma list
* from _Win32_Programming_ by Rector and Newcomer.
*/
#pragma warning(error:4002) /* too many actual parameters for macro */
#pragma warning(error:4003) /* not enough actual parameters for macro */
#pragma warning(1:4010) /* single-line comment contains line-continuation character */
#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
#pragma warning(1:4016) /* no function return type; using int as default */
#pragma warning(error:4020) /* too many actual parameters */
#pragma warning(error:4021) /* too few actual parameters */
#pragma warning(error:4027) /* function declared without formal parameter list */
#pragma warning(error:4029) /* declared formal parameter list different from definition */
#pragma warning(error:4033) /* 'function' must return a value */
#pragma warning(error:4035) /* 'function' : no return value */
#pragma warning(error:4045) /* array bounds overflow */
#pragma warning(error:4047) /* different levels of indirection */
#pragma warning(error:4049) /* terminating line number emission */
#pragma warning(error:4053) /* An expression of type void was used as an operand */
#pragma warning(error:4071) /* no function prototype given */
#pragma warning(disable:4101) /* unreferenced local variable */
#pragma warning(error:4150)
#pragma warning(disable:4244) /* No possible loss of data warnings */
#pragma warning(disable:4305) /* No truncation from int to char warnings */
#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */
/* work around Microsoft's premature attempt to deprecate the C-Library */
#define _CRT_SECURE_NO_WARNINGS
#define _CRT_NONSTDC_NO_WARNINGS

71
ports/atkmm/portfile.cmake Normal file
View File

@ -0,0 +1,71 @@
# ATK uses DllMain, so atkmm also
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(STATUS "Warning: Static building not supported. Building dynamic.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atkmm-2.24.2)
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
FILENAME "atkmm-2.24.2.tar.xz"
SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)
set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE})
if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
set(VS_PLATFORM "Win32")
endif(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/MSVC_Net2013/atkmm.sln
TARGET atkmm
PLATFORM ${VS_PLATFORM}
# Need this for it to pick up xerces-c port: https://github.com/Microsoft/vcpkg/issues/891
OPTIONS /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets
)
# Handle headers
file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(
COPY
${SOURCE_PATH}/atk/atkmm
DESTINATION ${CURRENT_PACKAGES_DIR}/include
FILES_MATCHING PATTERN *.h
)
# Handle libraries
file(
COPY
${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
)
file(
COPY
${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
)
file(
COPY
${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
)
file(
COPY
${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
)
vcpkg_copy_pdbs()
# Handle copyright and readme
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atkmm RENAME copyright)
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/atkmm RENAME readme.txt)

2
ports/azure-storage-cpp/CONTROL
View File

@ -1,5 +1,5 @@
Source: azure-storage-cpp
Version: 3.0.0-3
Version: 3.0.0-4
Build-Depends: cpprestsdk, atlmfc
Description: Microsoft Azure Storage Client SDK for C++
A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/

1
ports/azure-storage-cpp/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_apply_patches(
PATCHES
${CMAKE_CURRENT_LIST_DIR}/cmake.patch
${CMAKE_CURRENT_LIST_DIR}/static-builds.patch
${CMAKE_CURRENT_LIST_DIR}/support-cpprest-findpackage.patch
)
vcpkg_configure_cmake(

32
ports/azure-storage-cpp/support-cpprest-findpackage.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
index 3b4d1c0..d8818ac 100644
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
@@ -1,5 +1,5 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.8)
project(azurestorage)
enable_testing()
diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
index da66eb4..40e1767 100644
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
@@ -23,6 +23,16 @@ find_path(CASABLANCA_INCLUDE_DIR
include
)
+find_package(cpprestsdk)
+
+if(cpprestsdk_FOUND)
+ set(CASABLANCA_LIBRARY cpprestsdk::cpprest)
+ set(CASABLANCA_PROCESS_LIBS CASABLANCA_LIBRARY)
+ set(CASABLANCA_PROCESS_INCLUDES CASABLANCA_INCLUDE_DIR)
+ libfind_process(CASABLANCA)
+ return()
+endif()
+
# Library
find_library(CASABLANCA_LIBRARY
NAMES

276
ports/berkeleydb/CMakeLists.txt Normal file
View File

@ -0,0 +1,276 @@
cmake_minimum_required(VERSION 3.8)
project(berkeleydb C CXX)
option(INSTALL_HEADERS "Install header files" ON)
add_definitions(
-DWIN32
-D_WINDOWS
-D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEPRECATE
-D_LIB
)
if (BUILD_SHARED_LIBS)
add_definitions(
-D_LIB
)
else()
add_definitions(
-DDB_CREATE_DLL
-D_USRDLL
)
endif()
add_library(libdb48
btree/bt_compact.c
btree/bt_compare.c
btree/bt_compress.c
btree/bt_conv.c
btree/bt_curadj.c
btree/bt_cursor.c
btree/bt_delete.c
btree/bt_method.c
btree/bt_open.c
btree/bt_put.c
btree/bt_rec.c
btree/bt_reclaim.c
btree/bt_recno.c
btree/bt_rsearch.c
btree/bt_search.c
btree/bt_split.c
btree/bt_stat.c
btree/bt_upgrade.c
btree/bt_verify.c
btree/btree_auto.c
db/crdel_auto.c
db/crdel_rec.c
common/crypto_stub.c
cxx/cxx_db.cpp
cxx/cxx_dbc.cpp
cxx/cxx_dbt.cpp
cxx/cxx_env.cpp
cxx/cxx_except.cpp
cxx/cxx_lock.cpp
cxx/cxx_logc.cpp
cxx/cxx_mpool.cpp
cxx/cxx_multi.cpp
cxx/cxx_seq.cpp
cxx/cxx_txn.cpp
db/db.c
db/db_am.c
db/db_auto.c
common/db_byteorder.c
db/db_cam.c
db/db_cds.c
db/db_conv.c
db/db_dispatch.c
db/db_dup.c
common/db_err.c
common/db_getlong.c
common/db_idspace.c
common/db_compint.c
db/db_iface.c
db/db_join.c
common/db_log2.c
db/db_meta.c
db/db_method.c
db/db_open.c
db/db_overflow.c
db/db_ovfl_vrfy.c
db/db_pr.c
db/db_rec.c
db/db_reclaim.c
db/db_remove.c
db/db_rename.c
db/db_ret.c
db/db_setid.c
db/db_setlsn.c
common/db_shash.c
db/db_sort_multiple.c
db/db_stati.c
db/db_truncate.c
db/db_upg.c
db/db_upg_opd.c
db/db_vrfy.c
db/db_vrfyutil.c
db/partition.c
dbm/dbm.c
dbreg/dbreg.c
dbreg/dbreg_auto.c
dbreg/dbreg_rec.c
dbreg/dbreg_stat.c
dbreg/dbreg_util.c
common/dbt.c
env/env_alloc.c
env/env_config.c
env/env_failchk.c
env/env_file.c
env/env_globals.c
env/env_method.c
env/env_name.c
env/env_open.c
env/env_recover.c
env/env_region.c
env/env_register.c
env/env_sig.c
env/env_stat.c
fileops/fileops_auto.c
fileops/fop_basic.c
fileops/fop_rec.c
fileops/fop_util.c
hash/hash.c
hash/hash_auto.c
hash/hash_conv.c
hash/hash_dup.c
hash/hash_func.c
hash/hash_meta.c
hash/hash_method.c
hash/hash_open.c
hash/hash_page.c
hash/hash_rec.c
hash/hash_reclaim.c
hash/hash_stat.c
hash/hash_upgrade.c
hash/hash_verify.c
hmac/hmac.c
hsearch/hsearch.c
build_windows/libdb.def
lock/lock.c
lock/lock_deadlock.c
lock/lock_failchk.c
lock/lock_id.c
lock/lock_list.c
lock/lock_method.c
lock/lock_region.c
lock/lock_stat.c
lock/lock_timer.c
lock/lock_util.c
log/log.c
log/log_archive.c
log/log_compare.c
log/log_debug.c
log/log_get.c
log/log_method.c
log/log_put.c
log/log_stat.c
common/mkpath.c
mp/mp_alloc.c
mp/mp_bh.c
mp/mp_fget.c
mp/mp_fmethod.c
mp/mp_fopen.c
mp/mp_fput.c
mp/mp_fset.c
mp/mp_method.c
mp/mp_mvcc.c
mp/mp_region.c
mp/mp_register.c
mp/mp_resize.c
mp/mp_stat.c
mp/mp_sync.c
mp/mp_trickle.c
mutex/mut_alloc.c
mutex/mut_failchk.c
mutex/mut_method.c
mutex/mut_region.c
mutex/mut_stat.c
mutex/mut_win32.c
common/openflags.c
os/os_abort.c
os/os_addrinfo.c
os_windows/os_abs.c
os/os_alloc.c
os_windows/os_clock.c
os_windows/os_config.c
os_windows/os_cpu.c
os/os_ctime.c
os_windows/os_dir.c
os_windows/os_errno.c
os_windows/os_fid.c
os_windows/os_flock.c
os_windows/os_fsync.c
os_windows/os_getenv.c
os_windows/os_handle.c
os_windows/os_map.c
os_windows/os_mkdir.c
os_windows/os_open.c
os/os_pid.c
os_windows/os_rename.c
os/os_root.c
os/os_rpath.c
os_windows/os_rw.c
os_windows/os_seek.c
os/os_stack.c
os_windows/os_stat.c
os/os_tmpdir.c
os_windows/os_truncate.c
os/os_uid.c
os_windows/os_unlink.c
os_windows/os_yield.c
qam/qam.c
qam/qam_auto.c
qam/qam_conv.c
qam/qam_files.c
qam/qam_method.c
qam/qam_open.c
qam/qam_rec.c
qam/qam_stat.c
qam/qam_upgrade.c
qam/qam_verify.c
rep/rep_auto.c
rep/rep_backup.c
rep/rep_elect.c
rep/rep_lease.c
rep/rep_log.c
rep/rep_method.c
rep/rep_record.c
rep/rep_region.c
rep/rep_stat.c
rep/rep_util.c
rep/rep_verify.c
repmgr/repmgr_auto.c
repmgr/repmgr_elect.c
repmgr/repmgr_method.c
repmgr/repmgr_msg.c
repmgr/repmgr_net.c
repmgr/repmgr_queue.c
repmgr/repmgr_sel.c
repmgr/repmgr_stat.c
repmgr/repmgr_util.c
repmgr/repmgr_windows.c
sequence/seq_stat.c
sequence/sequence.c
hmac/sha1.c
clib/strsep.c
txn/txn.c
txn/txn_auto.c
txn/txn_chkpt.c
txn/txn_failchk.c
txn/txn_method.c
txn/txn_rec.c
txn/txn_recover.c
txn/txn_region.c
txn/txn_stat.c
txn/txn_util.c
common/os_method.c
common/util_cache.c
common/util_log.c
common/util_sig.c
common/zerofill.c
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} build_windows dbinc)
target_link_libraries(libdb48 PUBLIC ws2_32.lib)
install(TARGETS libdb48
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
if(INSTALL_HEADERS)
file(GLOB HEADERS build_windows/*.h)
install(FILES ${HEADERS} DESTINATION include)
endif()

3
ports/berkeleydb/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: berkeleydb
Version: 4.8.30
Description: A high-performance embedded database for key/value data.

23
ports/berkeleydb/portfile.cmake Normal file
View File

@ -0,0 +1,23 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/db-4.8.30.NC)
vcpkg_download_distfile(ARCHIVE
URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip"
FILENAME "db-4.8.30.NC.zip"
SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab
)
vcpkg_extract_source_archive(${ARCHIVE})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
)
vcpkg_install_cmake()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/berkeleydb RENAME copyright)

3
ports/blaze/CONTROL
View File

@ -1,3 +1,4 @@
Source: blaze
Version: 3.2
Version: 3.2-2
Build-Depends: boost, clapack
Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.

33
ports/blaze/no-absolute-paths-in-install.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d102ab..5d918b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ cmake_minimum_required(VERSION 3.5)
add_library(blaze INTERFACE)
target_include_directories(blaze INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
- $<INSTALL_INTERFACE:install>
+ $<INSTALL_INTERFACE:include>
)
target_compile_options(blaze INTERFACE
@@ -48,8 +48,8 @@ target_compile_options(blaze INTERFACE
#==================================================================================================
find_package(LAPACK REQUIRED)
-target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})
-target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
+target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)
+target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)
#==================================================================================================
@@ -57,7 +57,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
#==================================================================================================
find_package(Boost 1.54.0 REQUIRED)
-target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})
+target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
#==================================================================================================

22
ports/blaze/portfile.cmake
View File

@ -1,4 +1,3 @@
#header-only library
include(vcpkg_common_functions)
vcpkg_from_bitbucket(
@ -9,10 +8,23 @@ vcpkg_from_bitbucket(
HEAD_REF master
)
# Copy the blaze header files
file(COPY "${SOURCE_PATH}/blaze"
DESTINATION "${CURRENT_PACKAGES_DIR}/include"
FILES_MATCHING PATTERN "*.h")
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch"
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBLAZE_SMP_THREADS=C++11
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/blaze/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/blaze)

166
ports/boost/0001-Fix-boost-ICU-support.patch Normal file
View File

@ -0,0 +1,166 @@
---
libs/locale/build/Jamfile.v2 | 63 ++++++--------------------------------
libs/locale/build/has_icu_test.cpp | 4 ---
libs/regex/build/Jamfile.v2 | 47 +++++++---------------------
3 files changed, 20 insertions(+), 94 deletions(-)
diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2
index 578e722..5f25917 100644
--- a/libs/locale/build/Jamfile.v2
+++ b/libs/locale/build/Jamfile.v2
@@ -70,62 +70,17 @@ if $(ICU_LINK)
}
else
{
- searched-lib icuuc : : <name>icuuc
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuuc : : <toolset>msvc
- <variant>debug
- <name>icuucd
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuuc : : <name>this_is_an_invalid_library_name ;
-
- searched-lib icudt : : <search>$(ICU_PATH)/lib
- <name>icudata
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icudt : : <search>$(ICU_PATH)/lib
- <name>icudt
- <toolset>msvc
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icudt : : <name>this_is_an_invalid_library_name ;
-
- searched-lib icuin : : <search>$(ICU_PATH)/lib
- <name>icui18n
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <toolset>msvc
- <variant>debug
- <name>icuind
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <toolset>msvc
- <variant>release
- <name>icuin
- <search>$(ICU_PATH)/lib
- <link>shared
- <runtime-link>shared ;
-
- searched-lib icuin : : <name>this_is_an_invalid_library_name ;
-
- explicit icuuc icudt icuin ;
+ alias icuuc : /user-config//icuuc ;
+ alias icuin : /user-config//icuin ;
+ alias icudt : /user-config//icudt ;
+
+ explicit icuuc icuin icudt ;
ICU_OPTS = <include>$(ICU_PATH)/include
- <library>icuuc/<link>shared/<runtime-link>shared
- <library>icudt/<link>shared/<runtime-link>shared
- <library>icuin/<link>shared/<runtime-link>shared
- <dll-path>$(ICU_PATH)/bin
- <runtime-link>shared ;
+ <library>icuuc
+ <library>icuin
+ <library>icudt
+ <dll-path>$(ICU_PATH)/bin ;
diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp
index 9419b30..ed9be05 100644
--- a/libs/locale/build/has_icu_test.cpp
+++ b/libs/locale/build/has_icu_test.cpp
@@ -15,10 +15,6 @@
#include <unicode/uchar.h>
#include <unicode/coll.h>
-#if defined(_MSC_VER) && !defined(_DLL)
-#error "Mixing ICU with a static runtime doesn't work"
-#endif
-
int main()
{
icu::Locale loc;
diff --git a/libs/regex/build/Jamfile.v2 b/libs/regex/build/Jamfile.v2
index 58fd1fb..76ee9f4 100644
--- a/libs/regex/build/Jamfile.v2
+++ b/libs/regex/build/Jamfile.v2
@@ -48,50 +48,25 @@ if ! $(disable-icu)
}
else
{
- lib icuuc : : <runtime-link>shared <conditional>@path_options ;
- lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
- lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>icuucd <runtime-link>shared <conditional>@path_options ;
- lib icuuc : : <name>sicuuc <runtime-link>static <conditional>@path_options ;
- lib icuuc : : <toolset>msvc <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
- lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>sicuucd <runtime-link>static <conditional>@path_options ;
- lib icuuc : : <name>this_is_an_invalid_library_name ;
-
- lib icudt : : <name>icudata <runtime-link>shared <conditional>@path_options ;
- lib icudt : : <name>icudt <toolset>msvc <runtime-link>shared <conditional>@path_options ;
- lib icudt : : <name>icudt <toolset>intel <target-os>windows <runtime-link>shared <conditional>@path_options ;
- lib icudt : : <name>sicudata <runtime-link>static <conditional>@path_options ;
- lib icudt : : <name>sicudt <toolset>msvc <runtime-link>static <conditional>@path_options ;
- lib icudt : : <name>sicudt <toolset>intel <target-os>windows <runtime-link>static <conditional>@path_options ;
- lib icudt : : <name>this_is_an_invalid_library_name ;
-
- lib icuin : : <name>icui18n <runtime-link>shared <conditional>@path_options ;
- lib icuin : : <toolset>msvc <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
- lib icuin : : <toolset>msvc <name>icuin <runtime-link>shared <conditional>@path_options ;
- lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>icuind <runtime-link>shared <conditional>@path_options ;
- lib icuin : : <toolset>intel <target-os>windows <name>icuin <runtime-link>shared <conditional>@path_options ;
- lib icuin : : <name>sicui18n <runtime-link>static <conditional>@path_options ;
- lib icuin : : <toolset>msvc <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
- lib icuin : : <toolset>msvc <name>sicuin <runtime-link>static <conditional>@path_options ;
- lib icuin : : <toolset>intel <target-os>windows <variant>debug <name>sicuind <runtime-link>static <conditional>@path_options ;
- lib icuin : : <toolset>intel <target-os>windows <name>sicuin <runtime-link>static <conditional>@path_options ;
- lib icuin : : <name>this_is_an_invalid_library_name ;
+
+ alias icuuc : /user-config//icuuc ;
+ alias icuin : /user-config//icuin ;
+ alias icudt : /user-config//icudt ;
+
+ explicit icuuc icuin icudt ;
ICU_OPTS =
<include>$(ICU_PATH)/include
- <runtime-link>shared:<library>icuuc/<link>shared
- <runtime-link>shared:<library>icudt/<link>shared
- <runtime-link>shared:<library>icuin/<link>shared
- <runtime-link>static:<library>icuuc
- <runtime-link>static:<library>icudt
- <runtime-link>static:<library>icuin
- <define>BOOST_HAS_ICU=1
- <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
+ <library>icuuc
+ <library>icudt
+ <library>icuin
+ <define>BOOST_HAS_ICU=1
;
}
}
-unit-test has_icu : has_icu_test.cpp : $(ICU_OPTS) ;
+exe has_icu : has_icu_test.cpp : $(ICU_OPTS) ;
explicit has_icu ;
alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ;
--
2.12.2.windows.2

14
ports/boost/CONTROL
View File

@ -1,4 +1,16 @@
Source: boost
Version: 1.65.1
Version: 1.65.1-3
Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib, bzip2
Feature: locale-icu
Description: ICU backend for Boost.Locale
Build-Depends: icu
Feature: regex-icu
Description: ICU support for Boost.Regex
Build-Depends: icu
Feature: python
Description: a C++ library which enables seamless interoperability between C++ and the Python programming language.
Build-Depends: python3

31
ports/boost/desktop/user-config.jam
View File

@ -5,3 +5,34 @@ using msvc : 14.0 : cl.exe :
using msvc : 14.1 : cl.exe :
<setup>echo
;
using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_RELEASE@" ;
using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_DEBUG@" : <python-debugging>on ;
project user-config ;
lib advapi32 ;
lib icuuc : : <search>"@CURRENT_INSTALLED_DIR@/lib" : :
<runtime-link>"@LIB_RUNTIME_LINK@"
<library>advapi32 ;
lib icuuc : : <search>"@CURRENT_INSTALLED_DIR@/debug/lib"
<variant>debug
<name>icuucd : :
<runtime-link>"@LIB_RUNTIME_LINK@"
<library>advapi32 ;
lib icuin : : <search>"@CURRENT_INSTALLED_DIR@/lib" : :
<runtime-link>"@LIB_RUNTIME_LINK@" ;
lib icuin : : <search>"@CURRENT_INSTALLED_DIR@/debug/lib"
<variant>debug
<name>icuind : :
<runtime-link>"@LIB_RUNTIME_LINK@" ;
lib icudt : : <search>"@CURRENT_INSTALLED_DIR@/lib" : :
<runtime-link>"@LIB_RUNTIME_LINK@" ;
lib icudt : : <search>"@CURRENT_INSTALLED_DIR@/debug/lib"
<variant>debug
<name>icudtd : :
<runtime-link>"@LIB_RUNTIME_LINK@" ;

96
ports/boost/portfile.cmake
View File

@ -25,7 +25,8 @@ FILE(READ "${DIFF}" content)
STRING(REGEX REPLACE "include/" "" content "${content}")
set(DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff.fixed)
FILE(WRITE ${DIFF2} "${content}")
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF2})
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF2}
${CMAKE_CURRENT_LIST_DIR}/0001-Fix-boost-ICU-support.patch)
######################
# Cleanup previous builds
@ -76,19 +77,37 @@ message(STATUS "Bootstrapping done")
set(B2_OPTIONS
-sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-sICU_PATH="${CURRENT_INSTALLED_DIR}"
-j$ENV{NUMBER_OF_PROCESSORS}
--debug-configuration
--ignore-site-config
--hash
-q
--without-python
threading=multi
)
# Add build type specific options
set(B2_OPTIONS_DBG
-sZLIB_BINARY=zlibd
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-sBZIP2_BINARY=bz2d
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
)
set(B2_OPTIONS_REL
-sZLIB_BINARY=zlib
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-sBZIP2_BINARY=bz2
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
)
set(LIB_RUNTIME_LINK "shared")
if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
list(APPEND B2_OPTIONS runtime-link=shared)
else()
list(APPEND B2_OPTIONS runtime-link=static)
set(LIB_RUNTIME_LINK "static")
endif()
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -101,6 +120,30 @@ if(TRIPLET_SYSTEM_ARCH MATCHES "x64")
list(APPEND B2_OPTIONS address-model=64)
endif()
if("python" IN_LIST FEATURES)
# Find Python. Can't use find_package here, but we already know where everything is
file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python[0-9.]*")
set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION ${PYTHON_INCLUDE_PATH})
list(APPEND B2_OPTIONS_DBG python-debugging=on)
else()
list(APPEND B2_OPTIONS --without-python)
endif()
if("locale-icu" IN_LIST FEATURES)
list(APPEND B2_OPTIONS boost.locale.icu=on)
else()
list(APPEND B2_OPTIONS boost.locale.icu=off)
endif()
if("regex-icu" IN_LIST FEATURES)
list(APPEND B2_OPTIONS --enable-icu)
else()
list(APPEND B2_OPTIONS --disable-icu)
endif()
if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
list(APPEND B2_OPTIONS
windows-api=store
@ -136,6 +179,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
--without-thread
--without-iostreams
--without-container
--without-python
)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
find_path(PATH_TO_CL cl.exe)
@ -166,21 +210,14 @@ else()
message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
endif()
# Add build type specific options
set(B2_OPTIONS_DBG
${B2_OPTIONS}
-sZLIB_BINARY=zlibd
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-sBZIP2_BINARY=bz2d
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
${B2_OPTIONS_DBG}
)
set(B2_OPTIONS_REL
${B2_OPTIONS}
-sZLIB_BINARY=zlib
-sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-sBZIP2_BINARY=bz2
-sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
${B2_OPTIONS_REL}
)
######################
@ -222,7 +259,7 @@ file(
# Disable Boost auto-link.
file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
"\n#define BOOST_ALL_NO_LIB\n"
"\n#ifndef BOOST_ALL_NO_LIB\n#define BOOST_ALL_NO_LIB\n#endif\n"
)
file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
"\n#undef BOOST_ALL_DYN_LINK\n"
@ -267,14 +304,8 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
FILES_MATCHING PATTERN "*.dll")
endif()
file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib)
boost_rename_libs(RELEASE_LIBS)
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/boost_test_exec_monitor-vc140-mt-${VERSION}.lib)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
file(RENAME
${CURRENT_PACKAGES_DIR}/lib/boost_test_exec_monitor-vc140-mt-${VERSION}.lib
${CURRENT_PACKAGES_DIR}/lib/manual-link/boost_test_exec_monitor-vc140-mt-${VERSION}.lib
)
endif()
message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
message(STATUS "Packaging ${TARGET_TRIPLET}-dbg")
@ -288,13 +319,26 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif()
file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib)
boost_rename_libs(DEBUG_LIBS)
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/boost_test_exec_monitor-vc140-mt-gd-${VERSION}.lib)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
file(RENAME
${CURRENT_PACKAGES_DIR}/debug/lib/boost_test_exec_monitor-vc140-mt-gd-${VERSION}.lib
${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/boost_test_exec_monitor-vc140-mt-gd-${VERSION}.lib
)
endif()
message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")
macro(move_to_manual_link LIBNAME)
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/${LIBNAME}-vc140-mt-${VERSION_FULL}.lib)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
file(RENAME
${CURRENT_PACKAGES_DIR}/lib/${LIBNAME}-vc140-mt-${VERSION_FULL}.lib
${CURRENT_PACKAGES_DIR}/lib/manual-link/${LIBNAME}-vc140-mt-${VERSION_FULL}.lib
)
endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/${LIBNAME}-vc140-mt-gd-${VERSION_FULL}.lib)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
file(RENAME
${CURRENT_PACKAGES_DIR}/debug/lib/${LIBNAME}-vc140-mt-gd-${VERSION_FULL}.lib
${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/${LIBNAME}-vc140-mt-gd-${VERSION_FULL}.lib
)
endif()
endmacro()
move_to_manual_link(boost_test_exec_monitor)
move_to_manual_link(boost_prg_exec_monitor)
vcpkg_copy_pdbs()

8
ports/boost/uwp/user-config.jam
View File

@ -13,3 +13,11 @@ using msvc : 14.1 : cl.exe :
<linkflags>RuntimeObject.lib
<linkflags>ole32.lib
;
project user-config ;
lib icuuc : : <name>dummy_lib_that_doesnt_exist ;
lib icuin : : <name>dummy_lib_that_doesnt_exist ;
lib icudt : : <name>dummy_lib_that_doesnt_exist ;

24
ports/butteraugli/CMakeLists.txt
View File

@ -1,29 +1,19 @@
cmake_minimum_required(VERSION 3.8.0)
project(butteraugli)
project(butteraugli CXX)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
add_compile_options(-D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
if(MSVC)
add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX)
add_compile_options(/W3 /wd4005 /wd4996 /wd4018)
endif()
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
include_directories("." ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS})
if(BUILD_SHARED_LIBS)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif()
include_directories(".")
add_library(butteraugli_lib butteraugli/butteraugli.cc)
add_executable(butteraugli butteraugli/butteraugli_main.cc)
target_link_libraries(butteraugli butteraugli_lib ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
install(
TARGETS butteraugli_lib
RUNTIME DESTINATION bin
@ -32,6 +22,10 @@ install(
)
if(NOT DISABLE_INSTALL_TOOLS)
add_executable(butteraugli butteraugli/butteraugli_main.cc)
target_include_directories(butteraugli PRIVATE ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIRS})
target_link_libraries(butteraugli PRIVATE butteraugli_lib ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
install (
TARGETS butteraugli
RUNTIME DESTINATION tools/butteraugli

3
ports/capstone/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: capstone
Version: 3.0.5-rc3
Description:

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

@ -0,0 +1,51 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REF 3.0.5-rc3
REPO "aquynh/capstone"
SHA512 1327fc570fc2310f71c4d7329528c05e30b9ad68ea50254b9a8c4b3b113f5165c2e0474ec99bbe1e6e46f2820379f388e4c2082c156027e117d88a8f1908acfe
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CAPSTONE_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CAPSTONE_BUILD_SHARED)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DCAPSTONE_BUILD_STATIC=${CAPSTONE_BUILD_STATIC}
-DCAPSTONE_BUILD_SHARED=${CAPSTONE_BUILD_SHARED}
#-DCAPSTONE_ARCHS="x86"
-DCAPSTONE_X86_SUPPORT=ON
-DCAPSTONE_ARM_SUPPORT=ON
-DCAPSTONE_ARM64_SUPPORT=ON
-DCAPSTONE_MIPS_SUPPORT=OFF
-DCAPSTONE_PPC_SUPPORT=OFF
-DCAPSTONE_SPARC_SUPPORT=OFF
-DCAPSTONE_SYSZ_SUPPORT=OFF
-DCAPSTONE_XCORE_SUPPORT=OFF
-DCAPSTONE_BUILD_TESTS=OFF
OPTIONS_RELEASE
-DCAPSTONE_BUILD_DIET=ON
-DCAPSTONE_X86_REDUCE=ON
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
if(EXES)
file(REMOVE ${EXES})
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.txt
DESTINATION ${CURRENT_PACKAGES_DIR}/share/capstone
RENAME copyright)

2
ports/catch/CONTROL
View File

@ -1,3 +1,3 @@
Source: catch
Version: 1.10.0
Version: 1.11.0
Description: C++ Automated Test Cases in Headers

4
ports/catch/portfile.cmake
View File

@ -1,11 +1,11 @@
include(vcpkg_common_functions)
set(CATCH_VERSION v1.10.0)
set(CATCH_VERSION v1.11.0)
vcpkg_download_distfile(HEADER
URLS "https://github.com/philsquared/Catch/releases/download/${CATCH_VERSION}/catch.hpp"
FILENAME "catch-${CATCH_VERSION}.hpp"
SHA512 275ab5b5d778cc8a91b5f3e8f241a37b680c81d1b8945ff64ad16a9708c98e6535b389746bf8cacbed07f874629f456b56bafbf1879c5a6f84fa87675c1361b6
SHA512 8ce490cfa433ec1c6b6460d76e1d9a6502966ada96fec7290fe9827a965751f3d572e97b93bbbb5e2bc97ffcf70bb547a050405b80a1a816054bd6afd1208cbe
)
vcpkg_download_distfile(LICENSE

2
ports/cctz/CONTROL
View File

@ -1,3 +1,3 @@
Source: cctz
Version: v2.1
Version: 2.1
Description: two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.

2
ports/ceres/CONTROL
View File

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

15
ports/ceres/portfile.cmake
View File

@ -1,24 +1,9 @@
# 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

4
ports/cgal/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: cgal
Version: 4.11
Build-Depends:mpfr, mpir, zlib, boost, qt5
Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.

26
ports/cgal/portfile.cmake Normal file
View File

@ -0,0 +1,26 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
REF releases/CGAL-4.11
SHA512 91e555d5988bee387afa31331e1e3a8990206468fd8c774fd82979d9ff169e9c4835ecc6ba3d576cda617b6cb2cd52d27657d2434e38b29ce0e7e643436810ab
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/CGAL")
vcpkg_copy_pdbs()
# Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright of suitesparse and metis
file(COPY ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)

96
ports/cpprestsdk/0001_cmake.patch
View File

@ -1,96 +0,0 @@
diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
index 1274102..fe245e6 100644
--- a/Release/CMakeLists.txt
+++ b/Release/CMakeLists.txt
@@ -89,15 +89,6 @@ elseif(UNIX) # This includes OSX
option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
option(BUILD_SAMPLES "Build samples." ON)
- option(CASA_INSTALL_HEADERS "Install header files." ON)
- if(CASA_INSTALL_HEADERS)
- file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h include/cpprest/*.dat)
- install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
- file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
- install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
- file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h include/cpprest/details/*.dat)
- install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
- endif()
elseif(WIN32)
option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
option(BUILD_SAMPLES "Build samples." ON)
@@ -113,37 +104,25 @@ elseif(WIN32)
set(Casablanca_DEFINITIONS "" CACHE INTERNAL "Definitions for consume casablanca library")
endif()
add_definitions(${Casablanca_DEFINITIONS} -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32)
-
- if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
- set(NUGET_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../packages")
- set(PACKAGE_PATHS)
- list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost.1.58.0.0/")
- list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_system-vc140.1.58.0-vs140rc/")
- list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_date_time-vc140.1.58.0-vs140rc/")
- list(APPEND PACKAGE_PATHS "${NUGET_PATH}/boost_regex-vc140.1.58.0-vs140rc/")
- list(APPEND PACKAGE_PATHS "${NUGET_PATH}/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1/")
- list(APPEND PACKAGE_PATHS "${NUGET_PATH}/zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8/")
-
- if (NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
- find_library(Boost_SYSTEM_LIBRARY libboost_system-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
- find_library(Boost_DATE_TIME_LIBRARY libboost_date_time-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
- find_library(Boost_REGEX_LIBRARY libboost_regex-vc140-mt-gd-1_58.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/address-model-64/lib)
- set(Boost_LIBRARIES ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY})
-
- find_library(OpenSSL_libeay_LIBRARY libeay32.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
- find_library(OpenSSL_ssleay_LIBRARY ssleay32.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
- find_library(ZLIB_LIBRARY zlibstaticd.lib PATHS ${PACKAGE_PATHS} PATH_SUFFIXES lib/native/v140/windesktop/msvcstl/static/rt-dyn/x64/debug)
- set(OPENSSL_LIBRARIES ${OpenSSL_ssleay_LIBRARY} ${OpenSSL_libeay_LIBRARY} ${ZLIB_LIBRARY})
-
- set(OPENSSL_INCLUDE_DIR "${NUGET_PATH}/openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1/build/native/include")
- endif()
-
- set(Boost_INCLUDE_DIR "${NUGET_PATH}/boost.1.58.0.0/lib/native/include")
- endif()
+ if (NOT CPPREST_EXCLUDE_WEBSOCKETS AND NOT WINDOWS_STORE)
+ find_package(ZLIB REQUIRED)
+ find_package(OpenSSL REQUIRED)
+ find_package(Boost REQUIRED COMPONENTS regex system date_time)
+ endif()
else()
message(FATAL_ERROR "-- Unsupported Build Platform.")
endif()
+option(CASA_INSTALL_HEADERS "Install header files." ON)
+if(CASA_INSTALL_HEADERS)
+ file(GLOB CASA_HEADERS_CPPREST include/cpprest/*.hpp include/cpprest/*.h include/cpprest/*.dat)
+ install(FILES ${CASA_HEADERS_CPPREST} DESTINATION include/cpprest)
+ file(GLOB CASA_HEADERS_PPLX include/pplx/*.hpp include/pplx/*.h)
+ install(FILES ${CASA_HEADERS_PPLX} DESTINATION include/pplx)
+ file(GLOB CASA_HEADERS_DETAILS include/cpprest/details/*.hpp include/cpprest/details/*.h include/cpprest/details/*.dat)
+ install(FILES ${CASA_HEADERS_DETAILS} DESTINATION include/cpprest/details)
+endif()
+
# Compiler (not platform) specific settings
if(ANDROID)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
index 4074905..da907e5 100644
--- a/Release/src/CMakeLists.txt
+++ b/Release/src/CMakeLists.txt
@@ -144,10 +144,11 @@ elseif(ANDROID)
else()
set_target_properties(cpprest PROPERTIES
SOVERSION ${CPPREST_VERSION_MAJOR}.${CPPREST_VERSION_MINOR})
-
- install(
- TARGETS cpprest
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
- )
endif()
+
+install(
+ TARGETS cpprest
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ )
\ No newline at end of file

13
ports/cpprestsdk/0002_no_websocketpp_in_uwp.patch
View File

@ -1,13 +0,0 @@
diff --git a/release/CMakeLists.txt b/release/CMakeLists.txt
index fe245e6..94a5c57 100644
--- a/release/CMakeLists.txt
+++ b/release/CMakeLists.txt
@@ -177,7 +177,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
# These settings can be used by the test targets
set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
-if (NOT CPPREST_EXCLUDE_WEBSOCKETS)
+if (NOT CPPREST_EXCLUDE_WEBSOCKETS AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
find_path(WEBSOCKETPP_CONFIG websocketpp-config.cmake
HINTS /usr/lib/cmake/websocketpp)
find_path(WEBSOCKETPP_CONFIG_VERSION websocketpp-configVersion.cmake

14
ports/cpprestsdk/0003_openssl_110.patch
View File

@ -1,14 +0,0 @@
diff --git a/Release/src/websockets/client/ws_client_wspp.cpp b/Release/src/websockets/client/ws_client_wspp.cpp
index 9f91d68..4b5d506 100644
--- a/Release/src/websockets/client/ws_client_wspp.cpp
+++ b/Release/src/websockets/client/ws_client_wspp.cpp
@@ -76,7 +76,9 @@ static struct ASIO_SSL_memory_leak_suppress
{
~ASIO_SSL_memory_leak_suppress()
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
::SSL_COMP_free_compression_methods();
+#endif
}
} ASIO_SSL_memory_leak_suppressor;

4
ports/cpprestsdk/CONTROL
View File

@ -1,5 +1,5 @@
Source: cpprestsdk
Version: 2.9.0-4
Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
Version: 2.10.0
Build-Depends: zlib, openssl (windows), boost (windows), websocketpp (windows)
Description: C++11 JSON, REST, and OAuth library
The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.

18
ports/cpprestsdk/portfile.cmake
View File

@ -3,19 +3,10 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/cpprestsdk
REF v2.9.0
SHA512 7f6af05e2aaf49fb5ba24f4fac43b7787345d46913831504925cefc60d1b62e38457e1d628d5de8b0db891b59716d2bfe63a494ca0b337d67fc9ca5447a5ba9b
REF v2.10.0
SHA512 78e7a38c21db5b563d08cb082bfa96360ac44c66f2189a614d3d2bb71655fd82d931f138590d2dba2d6a4c0884ae37a5be34ea3b753c3517bd68ce490daf60b4
HEAD_REF master
)
if(NOT VCPKG_USE_HEAD_VERSION)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
${CMAKE_CURRENT_LIST_DIR}/0002_no_websocketpp_in_uwp.patch
${CMAKE_CURRENT_LIST_DIR}/0003_openssl_110.patch
)
endif()
set(OPTIONS)
if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@ -35,15 +26,12 @@ vcpkg_configure_cmake(
-DCPPREST_EXCLUDE_WEBSOCKETS=OFF
-DCPPREST_EXPORT_DIR=share/cpprestsdk
OPTIONS_DEBUG
-DCASA_INSTALL_HEADERS=OFF
-DCPPREST_INSTALL_HEADERS=OFF
)
vcpkg_install_cmake()
if(VCPKG_USE_HEAD_VERSION)
vcpkg_fixup_cmake_targets()
endif()
vcpkg_fixup_cmake_targets()
file(INSTALL
${SOURCE_PATH}/license.txt

2
ports/cppwinrt/CONTROL
View File

@ -1,3 +1,3 @@
Source: cppwinrt
Version: spring_2017_creators_update_for_vs_15.3
Version: fall_2017_creators_update_for_vs_15.3-2
Description: C++/WinRT is a standard C++ language projection for the Windows Runtime.

25
ports/cppwinrt/portfile.cmake
View File

@ -1,18 +1,21 @@
include(vcpkg_common_functions)
find_program(GIT git)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppwinrt-spring_2017_creators_update_for_vs_15.3)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/Microsoft/cppwinrt/archive/spring_2017_creators_update_for_vs_15.3.tar.gz"
FILENAME "cppwinrt-spring_2017_creators_update_for_vs_15.3.tar.gz"
SHA512 779586122552e49a79aff08f4476905e00c3b4ad3dbc502240e9a7cc59ec0e4ab6304149a66505923ab84d2b334059de9e18c84a5b0ed6bde106d19119ef911f
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/cppwinrt
REF fall_2017_creators_update_for_vs_15.3
SHA512 e3f987ed3f3dce019b8bf9f5451e53b42357473a003b8c14f9009e1848ee0463286bd46fdc3c739c8f7c2d232707e8018f5c087ffae784c745d51a8143f9a294
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
# Put the licence file where vcpkg expects it
file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt ${CURRENT_PACKAGES_DIR}/share/cppwinrt/copyright)
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppwinrt/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppwinrt/copyright)
# Copy the cppwinrt header files
file(GLOB HEADER_FILES ${SOURCE_PATH}/10.0.15063.0/winrt/*)
file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/winrt)
file(GLOB HEADER_FILES ${SOURCE_PATH}/10.0.16299.0/winrt/*)
file(
COPY ${HEADER_FILES}
DESTINATION ${CURRENT_PACKAGES_DIR}/include/winrt
REGEX "\.(gitattributes|gitignore)$" EXCLUDE
)

2
ports/cppzmq/CONTROL
View File

@ -1,4 +1,4 @@
Source: cppzmq
Version: 4.2.1
Version: 4.2.2
Build-Depends: zeromq
Description: lightweight messaging kernel, C++ bindings

13
ports/cppzmq/portfile.cmake
View File

@ -1,12 +1,13 @@
#header-only library
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppzmq-4.2.1)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/zeromq/cppzmq/archive/v4.2.1.zip"
FILENAME "cppzmq-4.2.1.zip"
SHA512 ee75ce4bd28ecb5ef660d1ed6f5522654eced6ded8745dc0c61df351f4ff0ff8980d1bd848b2649fcce4aa539a457e56e55b0a59cb49f44b0a29875d0ea28dce
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeromq/cppzmq
REF v4.2.2
SHA512 5f61ea4a16987c1363c3029cf46b3e83ddd86d65e8d639b0332d691f8fdb5cee121b5d72a9b8c89221daf52ea5892219e0bc4ea4e761bb1e7deb1659011dd3c9
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
# cppzmq is a single header library, so we just need to copy that file in the include directory
file(INSTALL ${SOURCE_PATH}/zmq.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)

2
ports/dlib/CONTROL
View File

@ -1,4 +1,4 @@
Source: dlib
Version: 19.4-5
Version: 19.7
Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3
Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++

37
ports/dlib/portfile.cmake
View File

@ -1,18 +1,13 @@
# Common Ambient Variables:
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# TARGET_TRIPLET is the current triplet (x86-windows, etc)
# PORT is the current port name (zlib, etc)
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dlib-19.4)
vcpkg_download_distfile(ARCHIVE
URLS "http://dlib.net/files/dlib-19.4.tar.bz2"
FILENAME "dlib-19.4.tar.bz2"
SHA512 c5ae22c507b57a13d880d79e9671730829114d0276508b0a41b373d3abae9057d960fce84fafe1be468d943910853baaa70c88f2516e20a0c41f3895bf217f7b
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO davisking/dlib
REF v19.7
SHA512 a3877066e04a411d96e910f4229c60a86971a9290e840aa4a5b2f0b102e9b8c37bfede259b80b71ba066d21eb0aa2565808e51d0eab6397ff5fd2bac60dcedd5
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg)
file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libpng)
file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/zlib)
@ -43,7 +38,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dlib)
# There is no way to suppress installation of the headers and resource files in debug build.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@ -53,7 +48,10 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/all)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/test)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/travis)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_neon)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cudnn)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cuda)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_cpp11)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm)
# Dlib encodes debug/release in its config.h. Patch it to respond to the NDEBUG macro instead.
@ -62,7 +60,14 @@ string(REPLACE "/* #undef ENABLE_ASSERTS */" "#if !defined(NDEBUG)\n#define ENAB
string(REPLACE "#define DLIB_DISABLE_ASSERTS" "#if defined(NDEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif" _contents ${_contents})
file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h ${_contents})
file(READ ${CURRENT_PACKAGES_DIR}/share/dlib/dlib.cmake _contents)
string(REPLACE
"get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
"get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)"
_contents "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/dlib/dlib.cmake "${_contents}")
# Handle copyright
file(COPY ${CURRENT_PACKAGES_DIR}/share/doc/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dlib)
file(COPY ${SOURCE_PATH}/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dlib)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/COPYRIGHT)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)

2
ports/double-conversion/CONTROL
View File

@ -1,3 +1,3 @@
Source: double-conversion
Version: 3.0.0-1
Version: 3.0.0-2
Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.

41
ports/double-conversion/portfile.cmake
View File

@ -23,28 +23,31 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
# Rename exported target files into something vcpkg_fixup_cmake_targets expects
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake
${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionTargets-debug.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends-release.cmake
${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets-release.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)
if(NOT VCPKG_USE_HEAD_VERSION)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionLibraryDepends-debug.cmake
${CURRENT_PACKAGES_DIR}/debug/CMake/double-conversionTargets-debug.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends-release.cmake
${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets-release.cmake)
file(RENAME ${CURRENT_PACKAGES_DIR}/CMake/double-conversionLibraryDepends.cmake
${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake)
file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake TARGETS_FILE)
string(REPLACE "double-conversionLibraryDepends" "double-conversionTargets" TARGETS_FILE "${TARGETS_FILE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake "${TARGETS_FILE}")
file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake TARGETS_FILE)
string(REPLACE "double-conversionLibraryDepends" "double-conversionTargets" TARGETS_FILE "${TARGETS_FILE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionTargets.cmake "${TARGETS_FILE}")
# Remove hardcoded paths from config file
file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake CONFIG_FILE)
string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion/double-conversionLibraryDepends.cmake"
"\${double-conversion_CMAKE_DIR}/double-conversionTargets.cmake" CONFIG_FILE "${CONFIG_FILE}")
string(REPLACE "${CURRENT_PACKAGES_DIR}"
"\${double-conversion_CMAKE_DIR}/../.." CONFIG_FILE "${CONFIG_FILE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake "${CONFIG_FILE}")
# Remove hardcoded paths from config file
file(READ ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake CONFIG_FILE)
string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/cmake/double-conversion/double-conversionLibraryDepends.cmake"
"\${double-conversion_CMAKE_DIR}/double-conversionTargets.cmake" CONFIG_FILE "${CONFIG_FILE}")
string(REPLACE "${CURRENT_PACKAGES_DIR}"
"\${double-conversion_CMAKE_DIR}/../.." CONFIG_FILE "${CONFIG_FILE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/CMake/double-conversionConfig.cmake "${CONFIG_FILE}")
vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/double-conversion)
endif()
vcpkg_copy_pdbs()

2
ports/eigen3/CONTROL
View File

@ -1,3 +1,3 @@
Source: eigen3
Version: 3.3.4-1
Version: 3.3.4-2
Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.

14
ports/eigen3/portfile.cmake
View File

@ -1,12 +1,12 @@
#header-only library
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eigen-eigen-5a0156e40feb)
vcpkg_download_distfile(ARCHIVE
URLS "http://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2"
FILENAME "eigen-3.3.4.tar.bz2"
SHA512 d67a3fd8f7ce811af65fc1d43ec347dadf9c643a49135f7e455fc303773bad09e80a125282c7dfca7a1993b79e1f66576ac92418119fbb0fa50c1a581b957c0d
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO eigen/eigen
REF 3.3.4
SHA512 4077a5c3b95e3573774ccd3fe6c7233cb4b83db2358c19b43ea796925bd0201451d8632bddc5d68b1b57bbf67c5473a8908926eed065a745689a2acec9711d5c
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}

206
ports/fdk-aac/CMakeLists.txt Normal file
View File

@ -0,0 +1,206 @@
cmake_minimum_required(VERSION 3.8.0)
project(fdk-aac)
set(AACDEC_SRC
libAACdec/src/aacdec_drc.cpp
libAACdec/src/aacdec_hcr.cpp
libAACdec/src/aacdecoder.cpp
libAACdec/src/aacdec_pns.cpp
libAACdec/src/aac_ram.cpp
libAACdec/src/block.cpp
libAACdec/src/channelinfo.cpp
libAACdec/src/ldfiltbank.cpp
libAACdec/src/rvlcbit.cpp
libAACdec/src/rvlc.cpp
libAACdec/src/aacdec_hcr_bit.cpp
libAACdec/src/aacdec_hcrs.cpp
libAACdec/src/aacdecoder_lib.cpp
libAACdec/src/aacdec_tns.cpp
libAACdec/src/aac_rom.cpp
libAACdec/src/channel.cpp
libAACdec/src/conceal.cpp
libAACdec/src/pulsedata.cpp
libAACdec/src/rvlcconceal.cpp
libAACdec/src/stereo.cpp
)
set(AACENC_SRC
libAACenc/src/aacenc.cpp
libAACenc/src/aacEnc_ram.cpp
libAACenc/src/band_nrg.cpp
libAACenc/src/block_switch.cpp
libAACenc/src/grp_data.cpp
libAACenc/src/metadata_main.cpp
libAACenc/src/pre_echo_control.cpp
libAACenc/src/quantize.cpp
libAACenc/src/tonality.cpp
libAACenc/src/aacEnc_rom.cpp
libAACenc/src/bandwidth.cpp
libAACenc/src/channel_map.cpp
libAACenc/src/intensity.cpp
libAACenc/src/ms_stereo.cpp
libAACenc/src/psy_configuration.cpp
libAACenc/src/sf_estim.cpp
libAACenc/src/transform.cpp
libAACenc/src/aacenc_lib.cpp
libAACenc/src/aacenc_tns.cpp
libAACenc/src/bit_cnt.cpp
libAACenc/src/chaosmeasure.cpp
libAACenc/src/line_pe.cpp
libAACenc/src/noisedet.cpp
libAACenc/src/psy_main.cpp
libAACenc/src/spreading.cpp
libAACenc/src/aacenc_pns.cpp
libAACenc/src/adj_thr.cpp
libAACenc/src/bitenc.cpp
libAACenc/src/dyn_bits.cpp
libAACenc/src/metadata_compressor.cpp
libAACenc/src/pnsparam.cpp
libAACenc/src/qc_main.cpp
)
set(FDK_SRC
libFDK/src/autocorr2nd.cpp
libFDK/src/dct.cpp
libFDK/src/FDK_bitbuffer.cpp
libFDK/src/FDK_core.cpp
libFDK/src/FDK_crc.cpp
libFDK/src/FDK_hybrid.cpp
libFDK/src/FDK_tools_rom.cpp
libFDK/src/FDK_trigFcts.cpp
libFDK/src/fft.cpp
libFDK/src/fft_rad2.cpp
libFDK/src/fixpoint_math.cpp
libFDK/src/mdct.cpp
libFDK/src/qmf.cpp
libFDK/src/scale.cpp
)
set(MPEGTPDEC_SRC
libMpegTPDec/src/tpdec_adif.cpp
libMpegTPDec/src/tpdec_adts.cpp
libMpegTPDec/src/tpdec_asc.cpp
libMpegTPDec/src/tpdec_drm.cpp
libMpegTPDec/src/tpdec_latm.cpp
libMpegTPDec/src/tpdec_lib.cpp
)
set( MPEGTPENC_SRC
libMpegTPEnc/src/tpenc_adif.cpp
libMpegTPEnc/src/tpenc_adts.cpp
libMpegTPEnc/src/tpenc_asc.cpp
libMpegTPEnc/src/tpenc_latm.cpp
libMpegTPEnc/src/tpenc_lib.cpp
)
set( PCMUTILS_SRC
libPCMutils/src/limiter.cpp
libPCMutils/src/pcmutils_lib.cpp
)
set(SBRDEC_SRC
libSBRdec/src/env_calc.cpp
libSBRdec/src/env_dec.cpp
libSBRdec/src/env_extr.cpp
libSBRdec/src/huff_dec.cpp
libSBRdec/src/lpp_tran.cpp
libSBRdec/src/psbitdec.cpp
libSBRdec/src/psdec.cpp
libSBRdec/src/psdec_hybrid.cpp
libSBRdec/src/sbr_crc.cpp
libSBRdec/src/sbr_deb.cpp
libSBRdec/src/sbr_dec.cpp
libSBRdec/src/sbrdec_drc.cpp
libSBRdec/src/sbrdec_freq_sca.cpp
libSBRdec/src/sbrdecoder.cpp
libSBRdec/src/sbr_ram.cpp
libSBRdec/src/sbr_rom.cpp
)
set(SBRENC_SRC
libSBRenc/src/bit_sbr.cpp
libSBRenc/src/env_bit.cpp
libSBRenc/src/fram_gen.cpp
libSBRenc/src/mh_det.cpp
libSBRenc/src/ps_bitenc.cpp
libSBRenc/src/ps_encode.cpp
libSBRenc/src/resampler.cpp
libSBRenc/src/sbr_encoder.cpp
libSBRenc/src/sbr_ram.cpp
libSBRenc/src/ton_corr.cpp
libSBRenc/src/code_env.cpp
libSBRenc/src/env_est.cpp
libSBRenc/src/invf_est.cpp
libSBRenc/src/nf_est.cpp
libSBRenc/src/ps_main.cpp
libSBRenc/src/sbrenc_freq_sca.cpp
libSBRenc/src/sbr_misc.cpp
libSBRenc/src/sbr_rom.cpp
libSBRenc/src/tran_det.cpp
)
set(SYS_SRC
libSYS/src/cmdl_parser.cpp
libSYS/src/conv_string.cpp
libSYS/src/genericStds.cpp
libSYS/src/wav_file.cpp
)
set(
libfdk_aac_SOURCES
${AACDEC_SRC} ${AACENC_SRC}
${MPEGTPDEC_SRC} ${MPEGTPENC_SRC}
${SBRDEC_SRC} ${SBRENC_SRC}
${PCMUTILS_SRC} ${FDK_SRC} ${SYS_SRC}
fdk-aac.def
)
include_directories(
.
win32
libAACdec/include
libAACenc/include
libSBRdec/include
libSBRenc/include
libMpegTPDec/include
libMpegTPEnc/include
libSYS/include
libFDK/include
libPCMutils/include
)
if(BUILD_SHARED_LIBS)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif()
add_library(fdk-aac ${libfdk_aac_SOURCES})
add_executable(aac-enc aac-enc.c wavreader.c)
target_link_libraries(aac-enc fdk-aac)
install(
TARGETS fdk-aac
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(NOT DISABLE_INSTALL_TOOLS)
install (
TARGETS aac-enc
RUNTIME DESTINATION tools/fdk-aac
)
endif()
if(NOT DISABLE_INSTALL_HEADERS)
install(
FILES
libAACdec/include/aacdecoder_lib.h
libAACenc/include/aacenc_lib.h
libSYS/include/FDK_audio.h
libSYS/include/genericStds.h
libSYS/include/machine_type.h
DESTINATION include
)
endif()

3
ports/fdk-aac/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: fdk-aac
Version: 2017-11-02-1e351
Description: A standalone library of the Fraunhofer FDK AAC code

19
ports/fdk-aac/fdk-aac.def Normal file
View File

@ -0,0 +1,19 @@
EXPORTS
aacDecoder_AncDataGet
aacDecoder_AncDataInit
aacDecoder_Close
aacDecoder_ConfigRaw
aacDecoder_DecodeFrame
aacDecoder_Fill
aacDecoder_GetFreeBytes
aacDecoder_GetLibInfo
aacDecoder_GetStreamInfo
aacDecoder_Open
aacDecoder_SetParam
aacEncClose
aacEncEncode
aacEncGetLibInfo
aacEncInfo
aacEncOpen
aacEncoder_GetParam
aacEncoder_SetParam

22
ports/fdk-aac/portfile.cmake Normal file
View File

@ -0,0 +1,22 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mstorsjo/fdk-aac
REF 1e3515e03e2dbdbd48dacc31ef75d25c201a4c51
SHA512 4bb0cb75fac46b30f64f5588a528f3c97d66b456fb866524018596dc79eb8b01735eb7e2bc56489127091924117a8a5f4a722dd9cc90c4caa8ad5c55e58faa40
HEAD_REF master
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/fdk-aac.def DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/fdk-aac)
file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fdk-aac RENAME copyright)

6
ports/ffmpeg/CONTROL
View File

@ -1,4 +1,8 @@
Source: ffmpeg
Version: 3.3.3
Version: 3.3.3-1
Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
Feature: openssl
Build-Depends: openssl
Description: openssl support in ffmpeg

25
ports/ffmpeg/detect-openssl.patch Normal file
View File

@ -0,0 +1,25 @@
From 18de5c60ae0a987680681d5a0602009b428504fa Mon Sep 17 00:00:00 2001
From: Gilles Khouzam <gillesk@microsoft.com>
Date: Mon, 19 Jun 2017 16:33:38 -0700
Subject: [PATCH] Add better detection for Openssl on Windows.
Look for libeay32 and ssleay32 as another detection mechanism
---
configure | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure b/configure
index a1818dc..1cf2a7c 100755
--- a/configure
+++ b/configure
@@ -5836,6 +5836,7 @@ enabled openssl && { use_pkg_config openssl openssl/ssl.h OPENSSL_init
check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
+ check_lib openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
die "ERROR: openssl not found"; }
enabled qtkit_indev && { check_header_objcc QTKit/QTKit.h || disable qtkit_indev; }
--
2.10.1.windows.1

14
ports/ffmpeg/portfile.cmake
View File

@ -11,6 +11,10 @@ vcpkg_download_distfile(ARCHIVE
SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/detect-openssl.patch
)
vcpkg_find_acquire_program(YASM)
get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
@ -18,6 +22,8 @@ set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
vcpkg_acquire_msys(MSYS_ROOT)
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}")
set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}")
set(_csc_PROJECT_PATH ffmpeg)
@ -25,8 +31,14 @@ file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg ${CURRENT_BU
set(OPTIONS "--disable-ffmpeg --disable-ffprobe --disable-doc --enable-debug")
set(OPTIONS "${OPTIONS} --enable-runtime-cpudetect")
if("openssl" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-openssl")
else()
set(OPTIONS "${OPTIONS} --disable-openssl")
endif()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\")
set(OPTIONS "${OPTIONS} --disable-programs --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}")
set(OPTIONS "${OPTIONS} --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00")
@ -54,6 +66,8 @@ endif()
set(OPTIONS_DEBUG "") # Note: --disable-optimizations can't be used due to http://ffmpeg.org/pipermail/libav-user/2013-March/003945.html
set(OPTIONS_RELEASE "")
set(OPTIONS "${OPTIONS} --extra-cflags=-DHAVE_UNISTD_H=0")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(OPTIONS "${OPTIONS} --disable-static --enable-shared")
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

2
ports/fftw3/CONTROL
View File

@ -1,3 +1,3 @@
Source: fftw3
Version: 3.3.6-p12-1
Version: 3.3.7
Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).

16
ports/fftw3/portfile.cmake
View File

@ -1,17 +1,9 @@
# Common Ambient Variables:
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# TARGET_TRIPLET is the current triplet (x86-windows, etc)
# PORT is the current port name (zlib, etc)
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
#
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fftw-3.3.6-pl2)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fftw-3.3.7)
vcpkg_download_distfile(ARCHIVE
URLS "http://www.fftw.org/fftw-3.3.6-pl2.tar.gz"
FILENAME "fftw-3.3.6-pl2.tar.gz"
SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
URLS "http://www.fftw.org/fftw-3.3.7.tar.gz"
FILENAME "fftw-3.3.7.tar.gz"
SHA512 a5db54293a6d711408bed5894766437eee920be015ad27023c7a91d4581e2ff5b96e3db0201e6eaccf7b064c4d32db1a2a8fab3e6813e524b4743ddd6216ba77
)
vcpkg_extract_source_archive(${ARCHIVE})

2
ports/flann/CONTROL
View File

@ -1,3 +1,3 @@
Source: flann
Version: 1.9.1-6
Version: 1.9.1-7
Description: Fast Library for Approximate Nearest Neighbors

4
ports/flann/portfile.cmake
View File

@ -37,9 +37,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann-gd.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp-gd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann-gd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flann_s-gd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann-gd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann_cpp-gd.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann_cpp.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp_s-gd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp-gd.lib)
elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_s-gd.lib)

4
ports/flint/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: flint
Version: 2.5.2
Description: Fast Library for Number Theory
Build-Depends: mpir, mpfr, pthreads, gettimeofday

76
ports/flint/dll_flint.patch Normal file
View File

@ -0,0 +1,76 @@
diff --git a/build.vc14/dll_flint/dll_flint.vcxproj b/build.vc14/dll_flint/dll_flint.vcxproj
index 3c8edd3c..947b4e38 100644
--- a/build.vc14/dll_flint/dll_flint.vcxproj
+++ b/build.vc14/dll_flint/dll_flint.vcxproj
@@ -81,7 +81,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -90,7 +90,7 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL
@@ -105,7 +105,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -114,7 +114,7 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL
@@ -129,7 +129,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -138,7 +138,7 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL
@@ -153,7 +153,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir);</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -162,7 +162,7 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL

40
ports/flint/lib_flint.patch Normal file
View File

@ -0,0 +1,40 @@
diff --git a/build.vc14/lib_flint/lib_flint.vcxproj b/build.vc14/lib_flint/lib_flint.vcxproj
index c6bd44c0..197d7723 100644
--- a/build.vc14/lib_flint/lib_flint.vcxproj
+++ b/build.vc14/lib_flint/lib_flint.vcxproj
@@ -81,7 +81,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -100,7 +100,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -119,7 +119,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -138,7 +138,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName>

117
ports/flint/portfile.cmake Normal file
View File

@ -0,0 +1,117 @@
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(STATUS "Warning: Dynamic building not supported yet. Building static.")
set(VCPKG_CRT_LINKAGE static)
set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
set(FLINT_VERSION 2.5.2)
set(FLINT_HASH "8606b369af505d5fcedd05d95fcd04afac2a916fc5291501c56785891cfdb2f9bc98700b2d05afd1d9482fb96df2a8c8bf1cd0e5696df46775df9fa743eb900b")
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flint-${FLINT_VERSION})
vcpkg_download_distfile(ARCHIVE_FILE
URLS "http://www.flintlib.org/flint-${FLINT_VERSION}.zip"
FILENAME "flint-${FLINT_VERSION}.zip"
SHA512 ${FLINT_HASH}
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/lib_flint.patch"
"${CMAKE_CURRENT_LIST_DIR}/dll_flint.patch"
)
set(MSVC_VERSION 14)
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
get_filename_component(SOURCE_DIR_NAME "${SOURCE_PATH}" NAME)
# Use fresh copy of sources for building and modification
set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${SOURCE_DIR_NAME}")
file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR)
configure_file(
"${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj" "${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj" @ONLY
)
configure_file(
"${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj" "${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj" @ONLY
)
file(RENAME "${SOURCE_PATH}/fmpz-conversions-gc.in" "${SOURCE_PATH}/fmpz-conversions.h")
IF (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
file(RENAME "${SOURCE_PATH}/fft_tuning32.in" "${SOURCE_PATH}/fft_tuning.h")
ELSE()
file(RENAME "${SOURCE_PATH}/fft_tuning64.in" "${SOURCE_PATH}/fft_tuning.h")
ENDIF()
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj
)
else()
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj
)
endif()
IF (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
SET(BUILD_ARCH "Win32")
ELSE()
SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE})
ENDIF()
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(GLOB FLINT_HEADERS "${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/*.h")
file(INSTALL
${FLINT_HEADERS}
DESTINATION ${CURRENT_PACKAGES_DIR}/include/flint
)
file(INSTALL
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Release/dll_flint.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
)
file(INSTALL
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Debug/dll_flint.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
)
file(INSTALL
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Release/dll_flint.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
RENAME flint.lib
)
file(INSTALL
${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Debug/dll_flint.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
RENAME flint.lib
)
vcpkg_copy_pdbs()
else()
file(GLOB FLINT_HEADERS "${SOURCE_PATH}/lib/${BUILD_ARCH}/Release/*.h")
file(INSTALL
${FLINT_HEADERS}
DESTINATION ${CURRENT_PACKAGES_DIR}/include/flint
)
file(INSTALL
${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/${BUILD_ARCH}/Release/lib_flint.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
RENAME flint.lib
)
file(INSTALL
${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/${BUILD_ARCH}/Debug/lib_flint.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
RENAME flint.lib
)
endif()
file(INSTALL
${SOURCE_PATH}/gpl-2.0.txt
DESTINATION ${CURRENT_PACKAGES_DIR}/share/flint
RENAME copyright
)
message(STATUS "Installing done")

2
ports/folly/CONTROL
View File

@ -1,4 +1,4 @@
Source: folly
Version: v2017.07.17.01-1
Version: 2017.10.02.00
Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
Build-Depends: zlib, openssl, boost, libevent, double-conversion, glog, gflags, lz4, liblzma, snappy

22
ports/folly/fix-MSG_ERRQUEUE.diff Normal file
View File

@ -0,0 +1,22 @@
diff --git a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp
index 7f8c5f13..f77adbc0 100644
--- a/folly/io/async/AsyncSocket.cpp
+++ b/folly/io/async/AsyncSocket.cpp
@@ -41,7 +41,7 @@ namespace fsp = folly::portability::sockets;
namespace folly {
static constexpr bool msgErrQueueSupported =
-#ifdef MSG_ERRQUEUE
+#if defined(MSG_ERRQUEUE) && !defined(_WIN32)
true;
#else
false;
@@ -1551,7 +1551,7 @@ void AsyncSocket::handleErrMessages() noexcept {
return;
}
-#ifdef MSG_ERRQUEUE
+#if defined(MSG_ERRQUEUE) && !defined(_WIN32)
uint8_t ctrl[1024];
unsigned char data;
struct msghdr msg;

11
ports/folly/fix-histogram.diff Normal file
View File

@ -0,0 +1,11 @@
--- a/folly/stats/Histogram.h
+++ b/folly/stats/Histogram.h
@@ -485,7 +485,7 @@
// with /permissive- (the default for the CMake build), so we directly include
// the -defs as if it were -inl, and don't provide the explicit instantiations.
// https://developercommunity.visualstudio.com/content/problem/81223/incorrect-error-c5037-with-permissive.html
-#if defined(_MSC_VER) && _MSC_FULL_VER >= 191125506 && _MSC_FULL_VER < 191125542
+#if defined(_MSC_VER) && _MSC_FULL_VER >= 191125506 && _MSC_FULL_VER <= 191125547
#define FOLLY_MSVC_USE_WORKAROUND_FOR_C5037 1
#else
#define FOLLY_MSVC_USE_WORKAROUND_FOR_C5037 0

12
ports/folly/fix-malloc.diff Normal file
View File

@ -0,0 +1,12 @@
--- a/folly/Malloc.h Mon Oct 09 04:35:09 2017
+++ b/folly/Malloc.h Fri Oct 13 15:31:36 2017
@@ -189,9 +189,6 @@
return false;
}
- /* Avoid optimizing away the malloc. */
- asm volatile("" ::"m"(ptr) : "memory");
-
return (origAllocated != *counter);
}();

98
ports/folly/fix-static-linking.diff Normal file
View File

@ -0,0 +1,98 @@
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
index 211c6fbf..fbcbddf0 100755
--- a/CMake/folly-deps.cmake
+++ b/CMake/folly-deps.cmake
@@ -10,9 +10,26 @@ find_package(Boost 1.55.0 MODULE
thread
REQUIRED
)
+
find_package(DoubleConversion MODULE REQUIRED)
-find_package(GFlags MODULE REQUIRED)
-find_package(GLog MODULE REQUIRED)
-find_package(LibEvent MODULE REQUIRED)
+
+find_package(gflags CONFIG)
+if(NOT TARGET gflags)
+ message(STATUS "MODULE: GFlags")
+ find_package(GFlags MODULE REQUIRED)
+endif()
+
+find_package(glog CONFIG)
+if(NOT TARGET glog::glog)
+ message(STATUS "MODULE: GLog")
+ find_package(GLog MODULE REQUIRED)
+endif()
+
+find_package(Libevent CONFIG)
+if(NOT TARGET event)
+ message(STATUS "MODULE: Libevent")
+ find_package(LibEvent MODULE REQUIRED)
+endif()
+
find_package(OpenSSL MODULE REQUIRED)
find_package(PThread MODULE)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdc992a8..c0231402 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,9 +141,38 @@ set(FOLLY_SHINY_DEPENDENCIES
set(FOLLY_LINK_LIBRARIES
${DOUBLE_CONVERSION_LIBRARY}
- ${LIBEVENT_LIB}
- ${LIBGFLAGS_LIBRARY}
- ${LIBGLOG_LIBRARY}
+)
+
+set(FOLLY_INCLUDE_DIRECTORIES
+ ${DOUBLE_CONVERSION_INCLUDE_DIR}
+)
+
+if(TARGET gflags_static)
+ set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} gflags_static)
+elseif(TARGET gflags)
+ set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} gflags)
+else()
+ set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBGFLAGS_LIBRARY})
+ set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBGFLAGS_INCLUDE_DIR})
+endif()
+
+if(TARGET glog::glog)
+ set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} glog::glog)
+else()
+ set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBGLOG_LIBRARY})
+ set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBGLOG_INCLUDE_DIR})
+endif()
+
+if(TARGET event)
+ set(FOLLY_SHINY_DEPENDENCIES ${FOLLY_SHINY_DEPENDENCIES} event)
+else()
+ set(FOLLY_LINK_LIBRARIES ${FOLLY_LINK_LIBRARIES} ${LIBEVENT_LIB})
+ set(FOLLY_INCLUDE_DIRECTORIES ${FOLLY_INCLUDE_DIRECTORIES} ${LIBEVENT_INCLUDE_DIR})
+endif()
+
+
+set(FOLLY_LINK_LIBRARIES
+ ${FOLLY_LINK_LIBRARIES}
Iphlpapi.lib
Ws2_32.lib
@@ -152,15 +181,12 @@ set(FOLLY_LINK_LIBRARIES
target_include_directories(folly_base
PUBLIC
- ${DOUBLE_CONVERSION_INCLUDE_DIR}
- ${LIBGFLAGS_INCLUDE_DIR}
- ${LIBGLOG_INCLUDE_DIR}
- ${LIBEVENT_INCLUDE_DIR}
- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+ ${FOLLY_INCLUDE_DIRECTORIES}
)
foreach (LIB ${FOLLY_SHINY_DEPENDENCIES})
target_include_directories(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INCLUDE_DIRECTORIES>)
+ target_compile_definitions(folly_base PUBLIC $<TARGET_PROPERTY:${LIB},INTERFACE_COMPILE_DEFINITIONS>)
endforeach()
if (FOLLY_HAVE_PTHREAD)

14
ports/folly/portfile.cmake
View File

@ -17,11 +17,21 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF v2017.07.17.01
SHA512 1529941ebcc9ee3502e4ab07463bb5bc6a397259cbbf1817ac64fd186fd4cd964ffe8b473fe6a432e80632ffa553106a0d3fe2962e860eb409e3391029ed5584
REF v2017.10.02.00
SHA512 4fc7840c7a6c528c8ba6a21817bc75f15f5cd5f781d104a1f0622fe1085a6cb26ff9749616b164afff0ea46be6d16877457a98f417e6dbe1044db7605650a6d3
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH
${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-static-linking.diff
${CMAKE_CURRENT_LIST_DIR}/fix-malloc.diff
${CMAKE_CURRENT_LIST_DIR}/fix-MSG_ERRQUEUE.diff
${CMAKE_CURRENT_LIST_DIR}/fix-histogram.diff
)
if(VCPKG_CRT_LINKAGE STREQUAL static)
set(MSVC_USE_STATIC_RUNTIME ON)
else()

2
ports/gdcm2/CONTROL
View File

@ -1,4 +1,4 @@
Source: gdcm2
Version: 2.6.8-1
Version: 2.8.3
Description: Grassroots DICOM library
Build-Depends: zlib, expat

11
ports/gdcm2/gdcmSystem.patch
View File

@ -1,11 +0,0 @@
--- a/Source/Common/gdcmSystem.cxx
+++ b/Source/Common/gdcmSystem.cxx
@@ -977,7 +977,7 @@
}
}
// We need to tell the user...
- gdcmWarningMacro( "Could not find Charset from alias: " + alias );
+ gdcmWarningMacro( std::string("Could not find Charset from alias: ") + alias );
return NULL;
}
#endif //_WIN32

7
ports/gdcm2/portfile.cmake
View File

@ -14,15 +14,14 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO malaterre/GDCM
REF v2.6.8
SHA512 f3b571f7e00b42b444acd6d696ba1979b6ef83e84744ecddb05ad09d8d2443027145c50cb67c6bc25d6b8e009833b643e575ab988106cb981f529cf455a9b0bc
HEAD_REF master
REF v2.8.3
SHA512 f8c3d600f067c9b60a32ff5fb7e751c06088e1e4a8e8d0f5e25d9fc7d49e8fab1f0242b10433f522d2043777cddace78c5a9c2cb25bac75a8e84fee554370f62
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/gdcmSystem.patch
${CMAKE_CURRENT_LIST_DIR}/socketxx.patch
)

11
ports/gdcm2/socketxx.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Utilities/socketxx/socket++/CMakeLists.txt
+++ b/Utilities/socketxx/socket++/CMakeLists.txt
@@ -76,7 +76,7 @@
endif()
set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES ${SOCKETXX_LIBRARY_PROPERTIES})
if(BUILD_SHARED_LIBS)
- set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES INTERFACE_LINK_LIBRARIES "" LINK_INTERFACE_LIBRARIES "")
+ set_target_properties(${SOCKETXX_LIBRARY_NAME} PROPERTIES INTERFACE_LINK_LIBRARIES "")
endif()
# Install library

14
ports/gettimeofday/CMakeLists.txt Normal file
View File

@ -0,0 +1,14 @@
cmake_minimum_required(VERSION 3.8)
project(gettimeofday C)
add_library(gettimeofday gettimeofday.c gettimeofday.def)
install(TARGETS gettimeofday
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
install(FILES gettimeofday.h DESTINATION include)
endif()

3
ports/gettimeofday/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: gettimeofday
Version: 2017-10-14-2
Description: An implementation of gettimeofday for WIN32

33
ports/gettimeofday/LICENSE Normal file
View File

@ -0,0 +1,33 @@
/*
* Copied from PostgreSQL source:
* http://doxygen.postgresql.org/gettimeofday_8c_source.html
*
*/
/*
* gettimeofday.c
* Win32 gettimeofday() replacement
*
* src/port/gettimeofday.c
*
* Copyright (c) 2003 SRA, Inc.
* Copyright (c) 2003 SKC, Inc.
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose, without fee, and without a
* written agreement is hereby granted, provided that the above
* copyright notice and this paragraph and the following two
* paragraphs appear in all copies.
*
* IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT,
* INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
* LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
* DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS
* IS" BASIS, AND THE AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
* SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/

67
ports/gettimeofday/gettimeofday.c Normal file
View File

@ -0,0 +1,67 @@
/*
* Copied from PostgreSQL source:
* http://doxygen.postgresql.org/gettimeofday_8c_source.html
*
*/
/*
* gettimeofday.c
* Win32 gettimeofday() replacement
*
* src/port/gettimeofday.c
*
* Copyright (c) 2003 SRA, Inc.
* Copyright (c) 2003 SKC, Inc.
*
* Permission to use, copy, modify, and distribute this software and
* its documentation for any purpose, without fee, and without a
* written agreement is hereby granted, provided that the above
* copyright notice and this paragraph and the following two
* paragraphs appear in all copies.
*
* IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT,
* INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
* LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
* DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS
* IS" BASIS, AND THE AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
* SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
#ifdef _MSC_VER
#include <winsock2.h>
/* FILETIME of Jan 1 1970 00:00:00. */
static const unsigned __int64 epoch = 116444736000000000Ui64;
/*
* timezone information is stored outside the kernel so tzp isn't used anymore.
*
* Note: this function is not for Win32 high precision timing purpose. See
* elapsed_time().
*/
int
gettimeofday(struct timeval * tp, struct timezone * tzp)
{
FILETIME file_time;
SYSTEMTIME system_time;
ULARGE_INTEGER ularge;
GetSystemTime(&system_time);
SystemTimeToFileTime(&system_time, &file_time);
ularge.LowPart = file_time.dwLowDateTime;
ularge.HighPart = file_time.dwHighDateTime;
tp->tv_sec = (long) ((ularge.QuadPart - epoch) / 10000000L);
tp->tv_usec = (long) (system_time.wMilliseconds * 1000);
return 0;
}
#endif /* _MSC_VER */

2
ports/gettimeofday/gettimeofday.def Normal file
View File

@ -0,0 +1,2 @@
EXPORTS
gettimeofday

13
ports/gettimeofday/gettimeofday.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef _MY_GETTIMEOFDAY_H_
#define _MY_GETTIMEOFDAY_H_
#ifdef _MSC_VER
#include <winsock2.h>
#include <time.h>
int gettimeofday(struct timeval * tp, struct timezone * tzp);
#endif /* _MSC_VER */
#endif /* _MY_GETTIMEOFDAY_H_ */

11
ports/gettimeofday/portfile.cmake Normal file
View File

@ -0,0 +1,11 @@
include(vcpkg_common_functions)
vcpkg_configure_cmake(
SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR}
PREFER_NINJA
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gettimeofday RENAME copyright)

4
ports/glibmm/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: glibmm
Version: 2.52.1
Description: This is glibmm, a C++ API for parts of glib that are useful for C++. See http://www.gtkmm.org.
Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp

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