mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 16:53:02 +08:00
[toolchain windows] set CMAKE_SYSTEM_PROCESSOR (#24100)
* [toolchain windows] set CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR In specific, I did this for the cpuinfo PR - I realized the reason that cpuinfo doesn't support arm64 windows cross compilation is because we don't set CMAKE_SYSTEM_PROCESSOR. * correctly set CMAKE_CROSSCOMPILING * start fixin libraries * more changes: - gainput: remove line - glog: remove try_run when cross compiling - windows.cmake: set CMAKE_SYSTEM_VERSION * more patches - mapnik: set BOOST_REGEX_HAS_ICU to avoid check_cxx_source_runs - orc: set HAS_PRE_1970 and HAS_POST_2038 for same - seal: change out check_cxx_source_runs for check_cxx_source_compiles * more changes * fix x86-windows * fix qpid-proton, glog * build corrade-rc * fix x64-uwp ports * forgot to _actually_ always build corrade-rc .,. * Replay #22831 * Dedupe CMAKE_SYSTEM_NAME settings. * Add quotes for corrade_rc_param Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update version DB. Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
parent
585ff442dd
commit
9ccd693f1b
@ -2,6 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 92089a3..d4c6762 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -240,4 +240,4 @@
|
||||
set(MP_EXPR_INFO_FILE ${MP_SOURCE_DIR}/src/expr-info.cc)
|
||||
-add_executable(gen-expr-info EXCLUDE_FROM_ALL
|
||||
+add_executable(gen-expr-info
|
||||
src/gen-expr-info.cc $<TARGET_OBJECTS:format>)
|
||||
if (MINGW)
|
||||
@@ -257,9 +257,15 @@ if (CMAKE_CROSSCOMPILING)
|
||||
COMMAND ${CMAKE_COMMAND} -E echo
|
||||
"warning: cannot re-generate ${MP_EXPR_INFO_FILE}")
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ampl-mp",
|
||||
"version-string": "2020-11-11",
|
||||
"port-version": 2,
|
||||
"version-date": "2020-11-11",
|
||||
"port-version": 3,
|
||||
"description": "An open-source library for mathematical programming",
|
||||
"homepage": "https://github.com/ampl/mp",
|
||||
"supports": "!uwp",
|
||||
|
@ -12,7 +12,7 @@ vcpkg_from_git(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
URL "https://aomedia.googlesource.com/aom"
|
||||
REF 6bbe6ae701d65bdf36bb72053db9b71f9739a083
|
||||
TAG v3.2.0
|
||||
FETCH_REF v3.2.0
|
||||
PATCHES
|
||||
aom-rename-static.diff
|
||||
# Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream
|
||||
@ -20,9 +20,16 @@ vcpkg_from_git(
|
||||
aom-uninitialized-pointer.diff
|
||||
)
|
||||
|
||||
set(aom_target_cpu "")
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
# UWP + aom's assembler files result in weirdness and build failures
|
||||
set(aom_target_cpu "-DAOM_TARGET_CPU=generic")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
OPTIONS
|
||||
${aom_target_cpu}
|
||||
-DENABLE_DOCS=OFF
|
||||
-DENABLE_EXAMPLES=OFF
|
||||
-DENABLE_TESTDATA=OFF
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "aom",
|
||||
"version-semver": "3.2.0",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "AV1 codec library",
|
||||
"homepage": "https://aomedia.googlesource.com/aom",
|
||||
"supports": "!(windows & arm & !uwp)",
|
||||
|
8
ports/caf/fix_cxx17.patch
Normal file
8
ports/caf/fix_cxx17.patch
Normal file
@ -0,0 +1,8 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ a/CMakeLists.txt
|
||||
@@ -115,3 +115,4 @@
|
||||
+target_compile_features(caf_internal INTERFACE cxx_std_17)
|
||||
# TODO: simply set CXX_STANDARD when switching to CMake ≥ 3.9.6
|
||||
-if(NOT CMAKE_CROSSCOMPILING)
|
||||
+if(0)
|
||||
try_compile(caf_has_cxx_17
|
@ -6,6 +6,7 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix_dependency.patch
|
||||
fix_cxx17.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "caf",
|
||||
"version": "0.18.6",
|
||||
"port-version": 1,
|
||||
"description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
|
||||
"homepage": "https://github.com/actor-framework/actor-framework",
|
||||
"license": "BSD-3-Clause",
|
||||
|
27
ports/corrade/build-corrade-rc-always.patch
Normal file
27
ports/corrade/build-corrade-rc-always.patch
Normal file
@ -0,0 +1,27 @@
|
||||
--- a/src/Corrade/Utility/CMakeLists.txt
|
||||
+++ b/src/Corrade/Utility/CMakeLists.txt
|
||||
@@ -185,13 +185,12 @@
|
||||
# corrade-rc when generating WinRT targets by setting
|
||||
# set_target_properties(corrade-rc PROPERTIES VS_WINRT_COMPONENT OFF)
|
||||
# Then this would be if(NOT CMAKE_CROSSCOMPILING OR CORRADE_TARGET_WINDOWS_RT).
|
||||
# However, it seems like this feature never materialized, as doing this will
|
||||
# result in corrade-rc that's looking for vcruntime140_app.dll in order to be
|
||||
# run. Last checked: Nov 2019.
|
||||
-if(NOT CMAKE_CROSSCOMPILING)
|
||||
# Sources for standalone corrade-rc
|
||||
set(CorradeUtilityRc_SRCS
|
||||
Arguments.cpp
|
||||
Debug.cpp
|
||||
Directory.cpp
|
||||
Configuration.cpp
|
||||
@@ -235,9 +234,10 @@
|
||||
if(CORRADE_TARGET_UNIX)
|
||||
target_link_libraries(corrade-rc PRIVATE ${CMAKE_DL_LIBS})
|
||||
endif()
|
||||
set_target_properties(corrade-rc PROPERTIES FOLDER "Corrade/Utility")
|
||||
install(TARGETS corrade-rc DESTINATION ${CORRADE_BINARY_INSTALL_DIR})
|
||||
|
||||
+if(NOT CMAKE_CROSSCOMPILING)
|
||||
# Corrade::rc target alias for superprojects
|
||||
add_executable(Corrade::rc ALIAS corrade-rc)
|
||||
endif()
|
@ -4,7 +4,9 @@ vcpkg_from_github(
|
||||
REF v2020.06
|
||||
SHA512 94cc8959b0ee43ecd8d13a25307e7829d53dc6601628d97c32288d1704e2c0835b755bffc06b2105e6aa5a612f119a60e83cb475860b51e6a35999215c100227
|
||||
HEAD_REF master
|
||||
PATCHES fix-vs2019.patch
|
||||
PATCHES
|
||||
fix-vs2019.patch
|
||||
build-corrade-rc-always.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
|
||||
@ -24,13 +26,23 @@ endforeach()
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS})
|
||||
|
||||
set(corrade_rc_param "")
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
set(corrade_rc_param
|
||||
"-DCORRADE_RC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/corrade/corrade-rc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
|
||||
)
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
PREFER_NINJA # Disable this option if project cannot be built with Ninja
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
"${corrade_rc_param}"
|
||||
-DUTILITY_USE_ANSI_COLORS=ON
|
||||
-DBUILD_STATIC=${BUILD_STATIC}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
CORRADE_RC_EXECUTABLE
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
@ -39,9 +51,8 @@ vcpkg_install_cmake()
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
# Install tools
|
||||
# corrade-rc is not built when CMAKE_CROSSCOMPILING
|
||||
if("utility" IN_LIST FEATURES)
|
||||
# Drop a copy of tools
|
||||
vcpkg_copy_tools(TOOL_NAMES "corrade-rc" AUTO_CLEAN)
|
||||
endif()
|
||||
|
||||
@ -67,4 +78,4 @@ file(INSTALL "${SOURCE_PATH}/COPYING"
|
||||
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
||||
RENAME copyright)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_copy_pdbs()
|
||||
|
@ -1,9 +1,19 @@
|
||||
{
|
||||
"name": "corrade",
|
||||
"version-string": "2020.06",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"description": "C++11/C++14 multiplatform utility library.",
|
||||
"homepage": "https://magnum.graphics/corrade/",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "corrade",
|
||||
"host": true,
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"utility"
|
||||
]
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
"interconnect",
|
||||
"pluginmanager",
|
||||
|
@ -6,7 +6,9 @@ vcpkg_from_github(
|
||||
REF a8397ba4591237c17d18e4acc091f5f3ebe7391e # 0.6.0
|
||||
SHA512 71a583e8190699d6df3dfa2857886089265cdfbcb916d9828a3611a1d6d23487464d6448b900b49637f015dd7d4e18bb206e0249af0932928f8ced13a081d42b
|
||||
HEAD_REF master
|
||||
PATCHES make_list_cpu_features_optional.patch
|
||||
PATCHES
|
||||
make_list_cpu_features_optional.patch
|
||||
windows-x86-fix.patch
|
||||
)
|
||||
|
||||
# If feature "tools" is not specified, disable building/exporting executable targets.
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "cpu-features",
|
||||
"version": "0.6.0",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime",
|
||||
"homepage": "https://github.com/google/cpu_features",
|
||||
"license": "Apache-2.0",
|
||||
|
17
ports/cpu-features/windows-x86-fix.patch
Normal file
17
ports/cpu-features/windows-x86-fix.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -60,13 +60,13 @@
|
||||
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
|
||||
set(PROCESSOR_IS_MIPS TRUE)
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
|
||||
set(PROCESSOR_IS_ARM TRUE)
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
|
||||
set(PROCESSOR_IS_AARCH64 TRUE)
|
||||
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
|
||||
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(AMD64|amd64)|(^i.86$)")
|
||||
set(PROCESSOR_IS_X86 TRUE)
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
|
||||
set(PROCESSOR_IS_POWER TRUE)
|
||||
endif()
|
||||
|
||||
macro(add_cpu_features_headers_and_sources HDRS_LIST_NAME SRCS_LIST_NAME)
|
@ -19,6 +19,11 @@ else()
|
||||
set(OPTION_USE_GL "-DOPTION_USE_GL=ON")
|
||||
endif()
|
||||
|
||||
set(fluid_path_param "")
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
@ -30,6 +35,7 @@ vcpkg_cmake_configure(
|
||||
-DOPTION_USE_SYSTEM_LIBJPEG=ON
|
||||
-DOPTION_BUILD_SHARED_LIBS=OFF
|
||||
-DFLTK_CONFIG_PATH=share/fltk
|
||||
${fluid_path_param}
|
||||
${OPTION_USE_GL}
|
||||
)
|
||||
|
||||
@ -39,7 +45,12 @@ vcpkg_cmake_config_fixup()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
if(VCPKG_TARGET_IS_OSX)
|
||||
# don't install fluid
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_copy_tools(TOOL_NAMES fltk-config AUTO_CLEAN)
|
||||
endif()
|
||||
elseif(VCPKG_TARGET_IS_OSX)
|
||||
vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN)
|
||||
elseif(VCPKG_TARGET_IS_WINDOWS)
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config")
|
||||
|
@ -1,11 +1,15 @@
|
||||
{
|
||||
"name": "fltk",
|
||||
"version": "1.3.8",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
|
||||
"homepage": "https://www.fltk.org/",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "fltk",
|
||||
"host": true
|
||||
},
|
||||
"libjpeg-turbo",
|
||||
"libpng",
|
||||
{
|
||||
|
@ -1,3 +1,6 @@
|
||||
set(XINPUT, "xinput") sets the variable "XINPUT," to "xinput",
|
||||
so this variable is never used anyways
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a443b66..61ff7b8 100644
|
||||
--- a/CMakeLists.txt
|
||||
@ -12,7 +15,7 @@ index a443b66..61ff7b8 100644
|
||||
else()
|
||||
set(XINPUT "Xinput9_1_0")
|
||||
- if ( ${CMAKE_SYSTEM_VERSION} LESS 6.1 )
|
||||
+ if ( ${CMAKE_SYSTEM_VERSION} VERSION_LESS 6.1 )
|
||||
+ if ( 0 )
|
||||
set(XINPUT, "xinput")
|
||||
endif()
|
||||
endif()
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "gainput",
|
||||
"version": "1.0.0",
|
||||
"port-version": 5,
|
||||
"port-version": 6,
|
||||
"description": "Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers",
|
||||
"homepage": "https://github.com/jkuhlmann/gainput",
|
||||
"license": "MIT",
|
||||
|
18
ports/glog/fix_crosscompile_symbolize.patch
Normal file
18
ports/glog/fix_crosscompile_symbolize.patch
Normal file
@ -0,0 +1,18 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -401,4 +401,7 @@
|
||||
if (WITH_SYMBOLIZE)
|
||||
if (WIN32 OR CYGWIN)
|
||||
+ if(CMAKE_CROSSCOMPILING)
|
||||
+ set(HAVE_SYMBOLIZE 0)
|
||||
+ else()
|
||||
cmake_push_check_state (RESET)
|
||||
set (CMAKE_REQUIRED_LIBRARIES DbgHelp)
|
||||
@@ -430,6 +433,7 @@
|
||||
]=] HAVE_SYMBOLIZE)
|
||||
|
||||
cmake_pop_check_state ()
|
||||
+ endif()
|
||||
|
||||
if (HAVE_SYMBOLIZE)
|
||||
set (HAVE_STACKTRACE 1)
|
@ -2,15 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 61e5f6c..889df87 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -65,7 +65,7 @@ include (GenerateExportHeader)
|
||||
include (GetCacheVariables)
|
||||
include (GNUInstallDirs)
|
||||
|
||||
-#set (CMAKE_DEBUG_POSTFIX d)
|
||||
+#set (CMAKE_DEBUG_POSTFIX d)
|
||||
set (CMAKE_THREAD_PREFER_PTHREAD 1)
|
||||
|
||||
find_package (GTest)
|
||||
@@ -501,6 +501,7 @@ set (GLOG_PUBLIC_H
|
||||
${CMAKE_CURRENT_BINARY_DIR}/glog/stl_logging.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/glog/vlog_is_on.h
|
||||
|
@ -9,6 +9,7 @@ vcpkg_from_github(
|
||||
fix_glog_CMAKE_MODULE_PATH.patch
|
||||
fix_log_every_n.patch
|
||||
nogdi-nominmax.patch
|
||||
fix_crosscompile_symbolize.patch
|
||||
|
||||
)
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
{
|
||||
"name": "glog",
|
||||
"version": "0.5.0",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "C++ implementation of the Google logging module",
|
||||
"homepage": "https://github.com/google/glog",
|
||||
"license": null,
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": [
|
||||
"gflags",
|
||||
{
|
||||
|
20
ports/libcopp/fix-x86-windows.patch
Normal file
20
ports/libcopp/fix-x86-windows.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -11,12 +11,17 @@
|
||||
libcopp
|
||||
VERSION "1.4.1"
|
||||
DESCRIPTION "Cross-platform coroutine library in C++ ."
|
||||
HOMEPAGE_URL "https://libcopp.atframe.work"
|
||||
LANGUAGES C CXX ASM)
|
||||
|
||||
+# libcopp requires x86 to be called i386
|
||||
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
|
||||
+ set(CMAKE_SYSTEM_PROCESSOR i386)
|
||||
+endif()
|
||||
+
|
||||
# ######################################################################################################################
|
||||
include("${PROJECT_SOURCE_DIR}/project/cmake/ProjectBuildOption.cmake")
|
||||
|
||||
# # #############################################################################
|
||||
echowithcolor(COLOR GREEN "-- Build Type: ${CMAKE_BUILD_TYPE}")
|
||||
|
@ -4,6 +4,7 @@ vcpkg_from_github(
|
||||
REF 1.4.1
|
||||
SHA512 eba06bd2de7c9ee557cdd0bf79e0c53e37722b671347436322c14c99e94d955477bfc0980a4f59a5c31051e108f952ec96791024c45fa8eeaa5f7a49099dd8ae
|
||||
HEAD_REF v2
|
||||
PATCHES fix-x86-windows.patch
|
||||
)
|
||||
|
||||
# atframework/cmake-toolset needed as a submodule for configure cmake
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "libcopp",
|
||||
"version-semver": "1.4.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"maintainers": "owent <admin@owent.net>",
|
||||
"description": "A cross-platfrom coroutine library for C++",
|
||||
"homepage": "https://github.com/owent/libcopp",
|
||||
|
@ -6,6 +6,7 @@ vcpkg_from_github(
|
||||
REF 01c32862f6f6e864c113efc3f0142e05ea3531fe #2021-12-02
|
||||
SHA512 016181db4573a1ab31547fbfb51e19fa09e4ee4e0e788434a7654921956a02547b55eda14ccfea98425f4f615fb90e0534c5e1010d5320c1958b65b0489a2931
|
||||
HEAD_REF master
|
||||
PATCHES remove-tests.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
30
ports/libhydrogen/remove-tests.patch
Normal file
30
ports/libhydrogen/remove-tests.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -139,12 +139,13 @@
|
||||
# Tests
|
||||
|
||||
set(tests_executable "${PROJECT_NAME}-tests")
|
||||
set(tests_run_target "${PROJECT_NAME}-run-tests")
|
||||
set(tests_run_file "${PROJECT_BINARY_DIR}/${tests_run_target}.done")
|
||||
|
||||
+if(0)
|
||||
enable_testing()
|
||||
add_executable("${tests_executable}" ${test_files})
|
||||
target_compile_options("${tests_executable}" PRIVATE ${compile_options})
|
||||
target_link_libraries("${tests_executable}" "${PROJECT_NAME}")
|
||||
add_test(NAME "${tests_executable}" COMMAND "${tests_executable}")
|
||||
|
||||
@@ -166,12 +167,13 @@
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
ARGS -E touch "${tests_run_file}"
|
||||
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}"
|
||||
VERBATIM)
|
||||
add_custom_target("${tests_run_target}" ALL DEPENDS "${tests_run_file}" VERBATIM)
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
# Generate Arduino package
|
||||
|
||||
set(arduino_package_file "${PROJECT_BINARY_DIR}/hydrogen-crypto.zip")
|
||||
|
||||
# Use the relative versions of the file path lists or else the full paths will end up in the
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "libhydrogen",
|
||||
"version-date": "2021-12-02",
|
||||
"port-version": 1,
|
||||
"description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments",
|
||||
"homepage": "https://github.com/jedisct1/libhydrogen",
|
||||
"dependencies": [
|
||||
|
@ -53,6 +53,7 @@ vcpkg_cmake_configure(
|
||||
-DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON
|
||||
-DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON
|
||||
-DUSE_EXTERNAL_MAPBOX_VARIANT=ON
|
||||
-DBOOST_REGEX_HAS_ICU=ON
|
||||
-DMAPNIK_CMAKE_DIR=share/mapnik/cmake
|
||||
-DFONTS_INSTALL_DIR=share/mapnik/fonts
|
||||
-DMAPNIK_PKGCONF_DIR=lib/pkgconfig
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "mapnik",
|
||||
"version-date": "2022-01-28",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Mapnik is an open source toolkit for developing mapping applications.",
|
||||
"homepage": "https://github.com/mapnik/mapnik",
|
||||
"license": "LGPL-2.1-only",
|
||||
|
@ -33,3 +33,127 @@ index 3e98dba..ee597f7 100644
|
||||
// cgemv_t.S return NaN if there are NaN or Inf in the buffer (see bug #746)
|
||||
if(trans && stack_alloc_size)
|
||||
memset(buffer, 0, MIN(BUFFER_SIZE, sizeof(FLOAT) * buffer_size));
|
||||
|
||||
--- a/driver/others/CMakeLists.txt
|
||||
+++ b/driver/others/CMakeLists.txt
|
||||
@@ -1,20 +1,23 @@
|
||||
include_directories(${PROJECT_SOURCE_DIR})
|
||||
include_directories(${PROJECT_BINARY_DIR})
|
||||
+if(WIN32)
|
||||
+ add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
|
||||
+endif()
|
||||
|
||||
if (${CORE} STREQUAL "PPC440")
|
||||
set(MEMORY memory_qalloc.c)
|
||||
else ()
|
||||
set(MEMORY memory.c)
|
||||
endif ()
|
||||
|
||||
if (USE_THREAD)
|
||||
|
||||
if (USE_OPENMP)
|
||||
set(BLAS_SERVER blas_server_omp.c)
|
||||
- elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+ elseif (WIN32)
|
||||
set(BLAS_SERVER blas_server_win32.c)
|
||||
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore")
|
||||
set(BLAS_SERVER blas_server_win32.c)
|
||||
endif ()
|
||||
|
||||
if (NOT DEFINED BLAS_SERVER)
|
||||
|
||||
--- a/cmake/os.cmake
|
||||
+++ b/cmake/os.cmake
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "AIX")
|
||||
set(EXTRALIB "${EXTRALIB} -lm")
|
||||
endif ()
|
||||
|
||||
# TODO: this is probably meant for mingw, not other windows compilers
|
||||
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+if (WIN32)
|
||||
|
||||
set(NEED_PIC 0)
|
||||
set(NO_EXPRECISION 1)
|
||||
|
||||
set(EXTRALIB "${EXTRALIB} -defaultlib:advapi32")
|
||||
|
||||
@@ -66,13 +66,13 @@
|
||||
|
||||
if (CYGWIN)
|
||||
set(NEED_PIC 0)
|
||||
set(NO_EXPRECISION 1)
|
||||
endif ()
|
||||
|
||||
-if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Interix" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android")
|
||||
+if (NOT WIN32 AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Interix" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android")
|
||||
if (USE_THREAD)
|
||||
set(EXTRALIB "${EXTRALIB} -lpthread")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (QUAD_PRECISION)
|
||||
|
||||
--- a/cmake/system.cmake
|
||||
+++ b/cmake/system.cmake
|
||||
@@ -422,22 +422,22 @@
|
||||
endif ()
|
||||
|
||||
if (USE_SIMPLE_THREADED_LEVEL3)
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DUSE_SIMPLE_THREADED_LEVEL3")
|
||||
endif ()
|
||||
|
||||
-if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+if (NOT WIN32)
|
||||
if (DEFINED MAX_STACK_ALLOC)
|
||||
if (NOT ${MAX_STACK_ALLOC} EQUAL 0)
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=${MAX_STACK_ALLOC}")
|
||||
endif ()
|
||||
else ()
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DMAX_STACK_ALLOC=2048")
|
||||
endif ()
|
||||
endif ()
|
||||
-if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+if (NOT WIN32)
|
||||
if (DEFINED BLAS3_MEM_ALLOC_THRESHOLD)
|
||||
if (NOT ${BLAS3_MEM_ALLOC_THRESHOLD} EQUAL 32)
|
||||
set(CCOMMON_OPT "${CCOMMON_OPT} -DBLAS3_MEM_ALLOC_THRESHOLD=${BLAS3_MEM_ALLOC_THRESHOLD}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
@@ -544,13 +544,13 @@
|
||||
|
||||
#For LAPACK Fortran codes.
|
||||
set(LAPACK_FFLAGS "${LAPACK_FFLAGS} ${CMAKE_Fortran_FLAGS}")
|
||||
set(LAPACK_FPFLAGS "${LAPACK_FPFLAGS} ${FPFLAGS}")
|
||||
|
||||
#Disable -fopenmp for LAPACK Fortran codes on Windows.
|
||||
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+if (NOT WIN32)
|
||||
set(FILTER_FLAGS "-fopenmp;-mp;-openmp;-xopenmp=parallel")
|
||||
foreach (FILTER_FLAG ${FILTER_FLAGS})
|
||||
string(REPLACE ${FILTER_FLAG} "" LAPACK_FFLAGS ${LAPACK_FFLAGS})
|
||||
string(REPLACE ${FILTER_FLAG} "" LAPACK_FPFLAGS ${LAPACK_FPFLAGS})
|
||||
endforeach ()
|
||||
endif ()
|
||||
@@ -562,17 +562,17 @@
|
||||
|
||||
set(LAPACK_CFLAGS "${CMAKE_C_CFLAGS} -DHAVE_LAPACK_CONFIG_H")
|
||||
if (INTERFACE64)
|
||||
set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_ILP64")
|
||||
endif ()
|
||||
|
||||
-if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+if (WIN32)
|
||||
set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DOPENBLAS_OS_WINDOWS")
|
||||
endif ()
|
||||
|
||||
-if (${CMAKE_C_COMPILER} STREQUAL "LSB" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
+if (${CMAKE_C_COMPILER} STREQUAL "LSB" OR WIN32)
|
||||
set(LAPACK_CFLAGS "${LAPACK_CFLAGS} -DLAPACK_COMPLEX_STRUCTURE")
|
||||
endif ()
|
||||
|
||||
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
|
||||
if ("${F_COMPILER}" STREQUAL "FLANG")
|
||||
if (${CMAKE_Fortran_COMPILER_VERSION} VERSION_LESS_EQUAL 3)
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "openblas",
|
||||
"version": "0.3.19",
|
||||
"port-version": 1,
|
||||
"description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.",
|
||||
"homepage": "https://github.com/xianyi/OpenBLAS",
|
||||
"dependencies": [
|
||||
|
@ -20,8 +20,13 @@ set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VC
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
set(BUILD_TOOLS OFF)
|
||||
# when cross compiling, we can't run their test. however:
|
||||
# - Windows doesn't support time_t < 0 => HAS_PRE_1970 test returns false
|
||||
# - Windows doesn't support setenv => HAS_POST_2038 test fails to compile
|
||||
set(time_t_checks "-DHAS_PRE_1970=OFF" "-DHAS_POST_2038=OFF")
|
||||
else()
|
||||
set(BUILD_TOOLS ON)
|
||||
set(time_t_checks "")
|
||||
endif()
|
||||
|
||||
if(VCPKG_TARGET_IS_UWP)
|
||||
@ -32,6 +37,7 @@ vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
${configure_opts}
|
||||
OPTIONS
|
||||
${time_t_checks}
|
||||
-DBUILD_TOOLS=${BUILD_TOOLS}
|
||||
-DBUILD_CPP_TESTS=OFF
|
||||
-DBUILD_JAVA=OFF
|
||||
@ -40,6 +46,8 @@ vcpkg_cmake_configure(
|
||||
-DPROTOBUF_EXECUTABLE:FILEPATH=${PROTOBUF_EXECUTABLE}
|
||||
-DSTOP_BUILD_ON_WARNING=OFF
|
||||
-DENABLE_TEST=OFF
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
ENABLE_TEST
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "orc",
|
||||
"version": "1.6.4",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"description": "The smallest, fastest columnar storage for Hadoop workloads.",
|
||||
"homepage": "https://orc.apache.org/",
|
||||
"dependencies": [
|
||||
|
@ -2,12 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a07945c..6df83d1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -75,7 +75,7 @@ ELSE()
|
||||
@@ -75,7 +75,8 @@ ELSE()
|
||||
LIST(APPEND PTHREADPOOL_SRCS src/portable-api.c src/memory.c)
|
||||
IF(APPLE AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "gcd"))
|
||||
LIST(APPEND PTHREADPOOL_SRCS src/gcd.c)
|
||||
- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event"))
|
||||
+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$" AND (PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "default" OR PTHREADPOOL_SYNC_PRIMITIVE STREQUAL "event"))
|
||||
+ add_compile_options(-wd4146)
|
||||
LIST(APPEND PTHREADPOOL_SRCS src/windows.c)
|
||||
ELSE()
|
||||
LIST(APPEND PTHREADPOOL_SRCS src/pthreads.c)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "pthreadpool",
|
||||
"version-date": "2020-04-10",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Portable (POSIX/Windows/Emscripten) thread pool for C/C++",
|
||||
"homepage": "https://github.com/Maratyszcza/pthreadpool",
|
||||
"dependencies": [
|
||||
|
@ -11,6 +11,12 @@ vcpkg_from_github(
|
||||
shared-zstd.patch
|
||||
)
|
||||
|
||||
vcpkg_replace_string(
|
||||
"${SOURCE_PATH}/cmake/CheckCXXIntrinsicsSpecific.cmake"
|
||||
"check_cxx_source_runs"
|
||||
"check_cxx_source_compiles"
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
ms-gsl SEAL_USE_MSGSL
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "seal",
|
||||
"version-semver": "3.7.2",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.",
|
||||
"homepage": "https://github.com/microsoft/SEAL",
|
||||
"dependencies": [
|
||||
|
17
ports/vc/dont-use-uninit-var.patch
Normal file
17
ports/vc/dont-use-uninit-var.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- a/Vc/avx/const.h
|
||||
+++ b/Vc/avx/const.h
|
||||
@@ -131,13 +131,13 @@
|
||||
#endif
|
||||
}
|
||||
template <> Vc_ALWAYS_INLINE Vc_CONST Vector<double> Const<double>::highMask(int bits)
|
||||
{
|
||||
#ifdef Vc_IMPL_AVX2
|
||||
#if defined Vc_ICC || defined Vc_MSVC
|
||||
- __m256i allone;
|
||||
+ auto allone = __m256i();
|
||||
allone = _mm256_cmpeq_epi8(allone, allone);
|
||||
#else
|
||||
auto allone = ~__m256i();
|
||||
#endif
|
||||
return _mm256_castsi256_pd(_mm256_slli_epi64(allone, bits));
|
||||
#else
|
@ -5,7 +5,8 @@ vcpkg_from_github(
|
||||
SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf
|
||||
HEAD_REF 1.4
|
||||
PATCHES
|
||||
"correct_cmake_config_path.patch"
|
||||
correct_cmake_config_path.patch
|
||||
dont-use-uninit-var.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "vc",
|
||||
"version": "1.4.2",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "SIMD Vector Classes for C++ .",
|
||||
"homepage": "https://github.com/VcDevel/Vc",
|
||||
"supports": "!arm64"
|
||||
|
@ -2,6 +2,38 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
|
||||
set(_VCPKG_WINDOWS_TOOLCHAIN 1)
|
||||
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "")
|
||||
|
||||
set(CMAKE_SYSTEM_NAME WindowsStore CACHE STRING "")
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
||||
set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
||||
set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
||||
set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "")
|
||||
endif()
|
||||
|
||||
if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
|
||||
set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE)
|
||||
endif()
|
||||
|
||||
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
|
||||
if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
|
||||
set(CMAKE_CROSSCOMPILING OFF CACHE STRING "")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
|
||||
# any of the four platforms can run x86 binaries
|
||||
set(CMAKE_CROSSCOMPILING OFF CACHE STRING "")
|
||||
elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64")
|
||||
# arm64 can run binaries of any of the four platforms after Windows 11
|
||||
set(CMAKE_CROSSCOMPILING OFF CACHE STRING "")
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED CMAKE_SYSTEM_VERSION)
|
||||
set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
|
||||
if(NOT _CMAKE_IN_TRY_COMPILE)
|
||||
|
||||
@ -20,11 +52,11 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
|
||||
endif()
|
||||
|
||||
set(_vcpkg_cpp_flags "/DWIN32 /D_WINDOWS /D_UNICODE /DUNICODE /DWINAPI_FAMILY=WINAPI_FAMILY_APP /D__WRL_NO_DEFAULT_LIB__" ) # VS adds /D "_WINDLL" for DLLs;
|
||||
set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")
|
||||
set(_vcpkg_common_flags "/nologo /Z7 /MP /GS /Gd /Gm- /W3 /WX- /Zc:wchar_t /Zc:inline /Zc:forScope /fp:precise /Oy- /EHsc")
|
||||
#/ZW:nostdlib -> ZW is added by CMake # VS also normally adds /sdl but not cmake MSBUILD
|
||||
set(_vcpkg_winmd_flag "")
|
||||
file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}" _vcpkg_vctools)
|
||||
set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}")
|
||||
set(ENV{_CL_} "/FU\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\" $ENV{_CL_}")
|
||||
# CMake has problems to correctly pass this in the compiler test so probably need special care in get_cmake_vars
|
||||
#set(_vcpkg_winmd_flag "/FU\\\\\"${_vcpkg_vctools}/lib/x86/store/references/platform.winmd\\\\\"") # VS normally passes /ZW for Apps
|
||||
|
||||
@ -48,11 +80,11 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
|
||||
if(CMAKE_GENERATOR MATCHES "Ninja")
|
||||
set(additional_exe_flags "/WINMD") # VS Generator chokes on this in the compiler detection
|
||||
endif()
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG /WINMD:NO /APPCONTAINER /SUBSYSTEM:CONSOLE /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}")
|
||||
# VS adds /DEBUG:FULL /TLBID:1. WindowsApp.lib is in CMAKE_C|CXX_STANDARD_LIBRARIES
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " /MANIFEST:NO /NXCOMPAT /DYNAMICBASE /DEBUG ${additional_exe_flags} /APPCONTAINER /MANIFESTUAC:NO ${VCPKG_LINKER_FLAGS} ${VCPKG_LINKER_FLAGS_RELEASE}")
|
||||
|
||||
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental
|
||||
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "") # VS uses /LTCG:incremental
|
||||
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF " CACHE STRING "")
|
||||
string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG_INIT " /nologo ")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT " /nologo ")
|
||||
|
@ -2,6 +2,38 @@ if(NOT _VCPKG_WINDOWS_TOOLCHAIN)
|
||||
set(_VCPKG_WINDOWS_TOOLCHAIN 1)
|
||||
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<STREQUAL:${VCPKG_CRT_LINKAGE},dynamic>:DLL>" CACHE STRING "")
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Windows CACHE STRING "")
|
||||
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
||||
set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
||||
set(CMAKE_SYSTEM_PROCESSOR AMD64 CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
||||
set(CMAKE_SYSTEM_PROCESSOR ARM CACHE STRING "")
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
set(CMAKE_SYSTEM_PROCESSOR ARM64 CACHE STRING "")
|
||||
endif()
|
||||
|
||||
if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
|
||||
set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE)
|
||||
endif()
|
||||
|
||||
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
|
||||
if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
|
||||
set(CMAKE_CROSSCOMPILING OFF CACHE STRING "")
|
||||
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
|
||||
# any of the four platforms can run x86 binaries
|
||||
set(CMAKE_CROSSCOMPILING OFF CACHE STRING "")
|
||||
elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64")
|
||||
# arm64 can run binaries of any of the four platforms after Windows 11
|
||||
set(CMAKE_CROSSCOMPILING OFF CACHE STRING "")
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED CMAKE_SYSTEM_VERSION)
|
||||
set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
|
||||
if(NOT _CMAKE_IN_TRY_COMPILE)
|
||||
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b3bdafa2896aad8990e3886bdd83b8cd5538e7ea",
|
||||
"version-date": "2020-11-11",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "d52dd1ac4a69a74bb658b52be36c7457ca6049ef",
|
||||
"version-string": "2020-11-11",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f251779a2df24b29eac37690d2692fda395218dd",
|
||||
"version-semver": "3.2.0",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "013d95ace27d59d663acada0264327bf5382308c",
|
||||
"version-semver": "3.2.0",
|
||||
|
@ -70,7 +70,7 @@
|
||||
},
|
||||
"ampl-mp": {
|
||||
"baseline": "2020-11-11",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"amqpcpp": {
|
||||
"baseline": "4.3.15",
|
||||
@ -102,7 +102,7 @@
|
||||
},
|
||||
"aom": {
|
||||
"baseline": "3.2.0",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"approval-tests-cpp": {
|
||||
"baseline": "10.12.2",
|
||||
@ -1218,7 +1218,7 @@
|
||||
},
|
||||
"caf": {
|
||||
"baseline": "0.18.6",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"caffe2": {
|
||||
"baseline": "0.8.1",
|
||||
@ -1550,7 +1550,7 @@
|
||||
},
|
||||
"corrade": {
|
||||
"baseline": "2020.06",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"cpp-base64": {
|
||||
"baseline": "V2.rc.08",
|
||||
@ -1658,7 +1658,7 @@
|
||||
},
|
||||
"cpu-features": {
|
||||
"baseline": "0.6.0",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"cpuid": {
|
||||
"baseline": "0.5.1",
|
||||
@ -2250,7 +2250,7 @@
|
||||
},
|
||||
"fltk": {
|
||||
"baseline": "1.3.8",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"fluidlite": {
|
||||
"baseline": "2020-08-27",
|
||||
@ -2398,7 +2398,7 @@
|
||||
},
|
||||
"gainput": {
|
||||
"baseline": "1.0.0",
|
||||
"port-version": 5
|
||||
"port-version": 6
|
||||
},
|
||||
"gamedev-framework": {
|
||||
"baseline": "0.20.0",
|
||||
@ -2554,7 +2554,7 @@
|
||||
},
|
||||
"glog": {
|
||||
"baseline": "0.5.0",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"gloo": {
|
||||
"baseline": "20201203",
|
||||
@ -3462,7 +3462,7 @@
|
||||
},
|
||||
"libcopp": {
|
||||
"baseline": "1.4.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"libcpplocate": {
|
||||
"baseline": "2.3.0",
|
||||
@ -3650,7 +3650,7 @@
|
||||
},
|
||||
"libhydrogen": {
|
||||
"baseline": "2021-12-02",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"libical": {
|
||||
"baseline": "3.0.11",
|
||||
@ -4398,7 +4398,7 @@
|
||||
},
|
||||
"mapnik": {
|
||||
"baseline": "2022-01-28",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"marble": {
|
||||
"baseline": "19.08.2",
|
||||
@ -5058,7 +5058,7 @@
|
||||
},
|
||||
"openblas": {
|
||||
"baseline": "0.3.19",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"opencascade": {
|
||||
"baseline": "7.6.0",
|
||||
@ -5230,7 +5230,7 @@
|
||||
},
|
||||
"orc": {
|
||||
"baseline": "1.6.4",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"orocos-kdl": {
|
||||
"baseline": "1.4",
|
||||
@ -5606,7 +5606,7 @@
|
||||
},
|
||||
"pthreadpool": {
|
||||
"baseline": "2020-04-10",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"pthreads": {
|
||||
"baseline": "3.0.0",
|
||||
@ -6410,7 +6410,7 @@
|
||||
},
|
||||
"seal": {
|
||||
"baseline": "3.7.2",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"secp256k1": {
|
||||
"baseline": "2017-19-10",
|
||||
@ -7302,7 +7302,7 @@
|
||||
},
|
||||
"vc": {
|
||||
"baseline": "1.4.2",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"vcglib": {
|
||||
"baseline": "1.0.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9b7001bd4d131fa36b766ca44a6ddbb47d3304a1",
|
||||
"version": "0.18.6",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "be83968f892180d5ee2f1943cf9cac3782e9111e",
|
||||
"version": "0.18.6",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "91ad9b127c41c0538051a0c81e2cb9206a2587dd",
|
||||
"version-string": "2020.06",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "087770e2a196c44cb1b56473bd57797ed9b9bc87",
|
||||
"version-string": "2020.06",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "608368f9c6d85d0278ae92687024e8bd31aecbe4",
|
||||
"version": "0.6.0",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "7df362e53cec246374da4f3d192bb1d4bb71b2b9",
|
||||
"version": "0.6.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "67f9090df208862fcd949bfae2214dd5fb0a3157",
|
||||
"version": "1.3.8",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "86da5d186aa27c3a6a9a9903eaa2806edde44bd8",
|
||||
"version": "1.3.8",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d7d03d82f8c42466bcd155b94e0dcefa79763931",
|
||||
"version": "1.0.0",
|
||||
"port-version": 6
|
||||
},
|
||||
{
|
||||
"git-tree": "6edb146db254b1cec192c12f335bef0e54455770",
|
||||
"version": "1.0.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "ecb04a5ba4d046af782f62ae7c167bd05b0101a8",
|
||||
"version": "0.5.0",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "10e0077ffa3485fa75178aa8e2a3f8ec0314573b",
|
||||
"version": "0.5.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "d2f995866846ccb6dd7ae147312e095c66f912db",
|
||||
"version-semver": "1.4.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "214d2cff167ae0646312fd5d5f2eecca62a91e19",
|
||||
"version-semver": "1.4.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "609fe75a9dbacc5dc5d3765cdaa1dd045eb89a13",
|
||||
"version-date": "2021-12-02",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "d5de7dac51afd6d1575a5a74f6a562b2affc1717",
|
||||
"version-date": "2021-12-02",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "dd7ab22238efd828be89e8e17677aa5b395ac07b",
|
||||
"version-date": "2022-01-28",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "ab089220fb5ecc215804a68c2122d3e0d3ed58bc",
|
||||
"version-date": "2022-01-28",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "90e2cde7fda025b587d6c41e699c98c263cf41eb",
|
||||
"version": "0.3.19",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "631541b0dcf2ea300f96829885d9bc0282d38a65",
|
||||
"version": "0.3.19",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8c8bc9de897f95a0499e5dc4a49545cda6e496b2",
|
||||
"version": "1.6.4",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "543e83b37120267db3f81b5fdb3d349717b20135",
|
||||
"version": "1.6.4",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "cb803332761faba74d3a5d83ca25b73d3285d397",
|
||||
"version-date": "2020-04-10",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "37e004fa65e21e9ffb647d6ff92cd834a46777cf",
|
||||
"version-date": "2020-04-10",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "323502a09f055a964f6b501aed82701570b96cba",
|
||||
"version-semver": "3.7.2",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "c3499eaa1c19049bc521c3d2799d8d7d6d032a8a",
|
||||
"version-semver": "3.7.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "98b96fa582424d700421161838544f1daf738467",
|
||||
"version": "1.4.2",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "57204c2b095452a828860a6476b8b997463ee36d",
|
||||
"version": "1.4.2",
|
||||
|
Loading…
Reference in New Issue
Block a user