Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
4b98150
[Invalid] Testing vcpkg without installed MSVC
Neumann-A Nov 12, 2024
5e74626
use lessmsi
Neumann-A Nov 12, 2024
13f4af9
update to 17.12. calc some versions
Neumann-A Nov 13, 2024
c668ae1
Fix details
Neumann-A Nov 14, 2024
59df484
include net 4.8.x
Neumann-A Nov 14, 2024
1a274d0
commit download generator
Neumann-A Nov 15, 2024
68f934f
Fix MSBuild
Neumann-A Nov 15, 2024
054908a
Fix Fortran stuff
Neumann-A Nov 16, 2024
5df3d96
Fix stuff detecting libm.lib from the intel compiler
Neumann-A Nov 17, 2024
e6e9900
update cmake to 3.31.0
Neumann-A Nov 21, 2024
b4bc90f
adjust cmake generator instance
Neumann-A Nov 21, 2024
0a72041
Only set GENERATOR_INSTANCE if supprted by generator
Neumann-A Nov 22, 2024
c023f86
fix single config build
Neumann-A Nov 23, 2024
24c76d9
fix include order
Neumann-A Nov 23, 2024
74f5fc5
Fix msbuild builds
Neumann-A Nov 27, 2024
c759757
fix easyhook
Neumann-A Nov 29, 2024
6a8088e
fix ffnvcodec
Neumann-A Nov 29, 2024
2ec7776
fix xqilla
Neumann-A Nov 29, 2024
6e78d24
Merge branch 'windows-triplet-without-installed-msvc' of https://gith…
Neumann-A Nov 29, 2024
c3ceef3
fix arpack-ng missing fortran
Neumann-A Nov 29, 2024
ee45443
fix usd
Neumann-A Nov 29, 2024
18e5c19
increase ninja version
Neumann-A Nov 29, 2024
db6afdf
adjust components
Neumann-A Nov 29, 2024
bd42c64
duilib fix single config
Neumann-A Nov 29, 2024
9fac459
fix marble
Neumann-A Nov 29, 2024
b6b62f9
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Nov 30, 2024
574cd1a
fix stuff
Neumann-A Nov 30, 2024
335598e
more fixers
Neumann-A Nov 30, 2024
c47e8d5
fix stuff
Neumann-A Dec 1, 2024
ab745ae
print sdk version
Neumann-A Dec 1, 2024
c5d6b80
fix crashpad
Neumann-A Dec 1, 2024
4ea0520
set policy 0149 to new in toolchain
Neumann-A Dec 1, 2024
a632a24
update to 17.12.3
Neumann-A Dec 4, 2024
b4dd862
install vcvars64.bat
Neumann-A Dec 9, 2024
d813402
Fix vcvars stuff
Neumann-A Dec 9, 2024
572c8d4
fix kf5texteditor
Neumann-A Dec 10, 2024
448a4ad
Try fixing stuff but it probably won't work
Neumann-A Dec 11, 2024
206cb47
Try setting CMAKE_WINDOWS_KITS_10_DIR
Neumann-A Dec 11, 2024
68ce61e
do not build qtwebengine opencv4 llvm
Neumann-A Dec 11, 2024
dbaad07
set policy outside the toolchain
Neumann-A Dec 12, 2024
7627178
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Dec 12, 2024
89c261e
Merge branch 'windows-triplet-without-installed-msvc' of https://gith…
Neumann-A Dec 12, 2024
23b5965
fix abs path
Neumann-A Dec 12, 2024
12bb0dc
fix pdcurses
Neumann-A Dec 12, 2024
ad2ab67
more fixes
Neumann-A Dec 12, 2024
312720c
fix a few failures
Neumann-A Dec 14, 2024
866e7d5
fix g2o
Neumann-A Dec 14, 2024
eeb2cf9
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Dec 14, 2024
4091ec1
fix openmvg
Neumann-A Dec 14, 2024
130bebb
abs path fix
Neumann-A Dec 14, 2024
24952b2
fix patch
Neumann-A Dec 15, 2024
e6db172
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Dec 23, 2024
93ac702
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Jan 4, 2025
8a33676
Adjust to different vs installation approach, add llvm
Neumann-A Jan 4, 2025
8c3343e
Adjust paths and port names
Neumann-A Jan 5, 2025
26f048a
cleanup
Neumann-A Jan 6, 2025
9c8db0b
Fix clang-cl python
Neumann-A Jan 6, 2025
3fd9721
Fix more ports
Neumann-A Jan 8, 2025
f001738
fix a bit
Neumann-A Jan 12, 2025
f93dc7f
update and fix protobuf
Neumann-A Jan 15, 2025
55d1b68
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Jan 15, 2025
6362d9e
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Jan 16, 2025
878f0eb
Fix a lot of details
Neumann-A Jan 27, 2025
0da4b8d
allow LOCALAPPDATA
Neumann-A Jan 30, 2025
fef1d94
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 3, 2025
7d5791f
Adjust a few paths and allow appdata in env
Neumann-A Feb 3, 2025
bca2d84
remove DEBUG and observe environment variables being unset
Neumann-A Feb 6, 2025
83e9ebb
allow userprofile
Neumann-A Feb 6, 2025
a434931
retrigger CI
Neumann-A Feb 6, 2025
417e631
cannot strip whitespace
Neumann-A Feb 6, 2025
2ad6f3a
allow more
Neumann-A Feb 6, 2025
52395d5
dont unset
Neumann-A Feb 6, 2025
cfc6e8d
more whitelisting
Neumann-A Feb 6, 2025
14361d2
retry with host triplet also being allowed
Neumann-A Feb 6, 2025
737c447
adjust environemnt cleanup to be in a common folder
Neumann-A Feb 6, 2025
f2cbeb7
Adjust fortran stuff
Neumann-A Feb 6, 2025
1dbe2bc
fix rename command
Neumann-A Feb 6, 2025
e57997c
fix missing }
Neumann-A Feb 7, 2025
085a26d
fix stuff
Neumann-A Feb 8, 2025
5924b1e
Fix stuff accidentally broken
Neumann-A Feb 8, 2025
790b1ee
Fix stuff
Neumann-A Feb 9, 2025
a1d484d
more fixes
Neumann-A Feb 10, 2025
e1c9f9c
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 10, 2025
a8a3d1b
adjust toolchain a little more
Neumann-A Feb 10, 2025
2a23024
fix more details
Neumann-A Feb 12, 2025
3f95781
fix cmake not being available and re-enable opencv4 and llvm
Neumann-A Feb 12, 2025
642ac9b
fix a few ports
Neumann-A Feb 12, 2025
c2d9947
use msvc for easyhook
Neumann-A Feb 12, 2025
215fcd1
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 13, 2025
9ada8ee
fix abs path opencv4
Neumann-A Feb 13, 2025
a662320
adjust some ports
Neumann-A Feb 13, 2025
031d2bb
more fixes
Neumann-A Feb 13, 2025
7889c59
fix tesseract
Neumann-A Feb 14, 2025
3f97665
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 14, 2025
08acd23
switch nspr and 3fd to msvc
Neumann-A Feb 14, 2025
9f4b8c6
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 16, 2025
6bca07d
use rc for hwloc
Neumann-A Feb 16, 2025
be01b46
fix cspice
Neumann-A Feb 16, 2025
7e74201
switching a few ports to msvc
Neumann-A Feb 16, 2025
b75a63a
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 19, 2025
4634564
fix more stuff
Neumann-A Feb 19, 2025
47da960
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 19, 2025
ffdf37e
more adjustments
Neumann-A Feb 22, 2025
12025d2
more fixes
Neumann-A Feb 23, 2025
1faee64
adjust ci
Neumann-A Feb 23, 2025
50dea5e
fix missing space in vcpkg-make
Neumann-A Feb 23, 2025
85e40da
more adjustments
Neumann-A Feb 24, 2025
416682e
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 24, 2025
c7d0a39
more adjustments
Neumann-A Feb 24, 2025
cbca88c
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 25, 2025
cefe1e1
fix curl
Neumann-A Feb 25, 2025
77897d8
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 25, 2025
4a758da
Fix azure ports
Neumann-A Feb 25, 2025
6ca9734
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Feb 26, 2025
9efb544
remove host path from config
Neumann-A Feb 26, 2025
2449ee1
update compiler
Neumann-A Mar 8, 2025
0ee0a46
Merge remote-tracking branch 'upstream/master' into windows-triplet-w…
Neumann-A Mar 8, 2025
d2acd0f
adjust download dir
Neumann-A Mar 9, 2025
087268b
remove wx
Neumann-A Mar 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ __pycache__/
/packages/
/scripts/buildsystems/tmp/
#ignore custom triplets
/triplets/*

#add vcpkg-designed triplets back in
!/triplets/arm-uwp.cmake
!/triplets/arm64-windows.cmake
Expand Down
2 changes: 2 additions & 0 deletions ports/apriltag/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ vcpkg_from_github(
REF v${VERSION}
SHA512 861f473ab861dfe749084aefccf52299bdbdf067cff539098a87d007b65711f2e3549ec442fa71011992ea37772fa1e97f1b22a2b130753694a0b8d5d798423e
HEAD_REF master
PATCHES
remove_werror.patch
)

vcpkg_cmake_configure(
Expand Down
13 changes: 13 additions & 0 deletions ports/apriltag/remove_werror.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a6bc1e7a6..7f6e64ff3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()

-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+if(0)
add_compile_options(-Wall -Wextra -Werror)
# add_compile_options(-Wpedantic)
add_compile_options(-Wno-shift-negative-value)
1 change: 1 addition & 0 deletions ports/apriltag/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "apriltag",
"version": "3.4.3",
"port-version": 1,
"description": "AprilTag is a visual fiducial system popular for robotics research.",
"homepage": "https://april.eecs.umich.edu/software/apriltag",
"license": "BSD-2-Clause",
Expand Down
13 changes: 13 additions & 0 deletions ports/atliac-minitest/clang-cl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/minitest/include/Atliac/minitest.h b/minitest/include/Atliac/minitest.h
index 59b6ffb900..27c83be21f 100644
--- a/minitest/include/Atliac/minitest.h
+++ b/minitest/include/Atliac/minitest.h
@@ -22,7 +22,7 @@
#include <cxxabi.h>
#endif

-#if defined(_WIN32) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL)
+#if defined(_WIN32) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL) && !defined(__clang__)
#error The conforming preprocessor is required. Use '/Zc:preprocessor' compiler option to enable it.
#endif // defined(_WIN32) &&(!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL)

2 changes: 2 additions & 0 deletions ports/atliac-minitest/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 bd39aa9d4f897f03f0f42b28ee7aabc0fbe5168d09009ebcb253ee3cb5f52ae1d81e9c6657aaa93fe8f67d20d9d92874432a06cadcb78f750681772bb3316d78
HEAD_REF master
PATCHES
clang-cl.patch
)

vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}
Expand Down
1 change: 1 addition & 0 deletions ports/atliac-minitest/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "atliac-minitest",
"version": "1.0.0",
"port-version": 1,
"description": "A C++ unit testing framework that helps write tests alongside the code being tested.",
"homepage": "https://github.com/Atliac/minitest",
"license": "MIT",
Expand Down
18 changes: 18 additions & 0 deletions ports/avro-c/clang-cl-type-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/lang/c/src/datafile.c b/lang/c/src/datafile.c
index c9d4dfeb68..870ff9a4d2 100644
--- a/lang/c/src/datafile.c
+++ b/lang/c/src/datafile.c
@@ -81,11 +81,12 @@ static int write_header(avro_file_writer_t w)
avro_writer_t schema_writer;
const avro_encoding_t *enc = &avro_binary_encoding;
int64_t schema_len;
+ const char* obj = "Obj";

/* Generate random sync */
generate_sync(w);

- check(rval, avro_write(w->writer, "Obj", 3));
+ check(rval, avro_write(w->writer, (void *)obj, 3));
check(rval, avro_write(w->writer, &version, 1));

check(rval, enc->write_long(w->writer, 2));
1 change: 1 addition & 0 deletions ports/avro-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
avro.patch # Private vcpkg build fixes
clang-cl-type-fix.patch
)

vcpkg_cmake_configure(
Expand Down
31 changes: 31 additions & 0 deletions ports/awlib/fix-compile-errors.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/types/include/aw/types/bits/variant_dispatch.h b/types/include/aw/types/bits/variant_dispatch.h
index 9d5dc3baa2..95a9394107 100644
--- a/types/include/aw/types/bits/variant_dispatch.h
+++ b/types/include/aw/types/bits/variant_dispatch.h
@@ -71,11 +71,11 @@ struct vh_recursive {
if constexpr (Length_left > 0)
{
if (index < Mid)
- return vh_recursive<Start,Mid,Ts...>::template dispatch(index, storage, f);
+ return vh_recursive<Start,Mid,Ts...>::dispatch(index, storage, f);
}

if constexpr (Length_right > 1)
- return vh_recursive<Mid+1,End,Ts...>::template dispatch(index, storage, f);
+ return vh_recursive<Mid+1,End,Ts...>::dispatch(index, storage, f);

_unreachable();
}
diff --git a/types/include/aw/types/containers/queue.h b/types/include/aw/types/containers/queue.h
index af8f13bbf5..e5869c5409 100644
--- a/types/include/aw/types/containers/queue.h
+++ b/types/include/aw/types/containers/queue.h
@@ -96,7 +96,7 @@ protected:
queue_base(queue_base&& other, Allocator const& alloc) noexcept
: impl(alloc)
{
- if (alloc == other.alloc)
+ if (alloc == other.alloc())
impl.swap(other.impl);
else
create_storage(other.allocated_size());
1 change: 1 addition & 0 deletions ports/awlib/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-mac-build.patch
fix-compile-errors.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
168 changes: 168 additions & 0 deletions ports/azure-macro-utils-c/ifdef-clang-cl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
diff --git a/inc/azure_macro_utils/macro_utils_generated.h b/inc/azure_macro_utils/macro_utils_generated.h
index 6ca14a19c..955fee096 100644
--- a/inc/azure_macro_utils/macro_utils_generated.h
+++ b/inc/azure_macro_utils/macro_utils_generated.h
@@ -8533,7 +8533,7 @@

#define MU_THE_NTH_ARG(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, P23, P24, P25, P26, P27, P28, P29, P30, P31, P32, P33, P34, P35, P36, P37, P38, P39, P40, P41, P42, P43, P44, P45, P46, P47, P48, P49, P50, P51, P52, P53, P54, P55, P56, P57, P58, P59, P60, P61, P62, P63, P64, P65, P66, P67, P68, P69, P70, P71, P72, P73, P74, P75, P76, P77, P78, P79, P80, P81, P82, P83, P84, P85, P86, P87, P88, P89, P90, P91, P92, P93, P94, P95, P96, P97, P98, P99, P100, P101, P102, P103, P104, P105, P106, P107, P108, P109, P110, P111, P112, P113, P114, P115, P116, P117, P118, P119, P120, P121, P122, P123, P124, ... ) P124

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_COUNT_1_OR_MORE_ARG(...) MU_THE_NTH_ARG MU_LPAREN __VA_ARGS__, \
123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1)
#define MU_MORE_THAN_1_ARG(...) MU_THE_NTH_ARG MU_LPAREN __VA_ARGS__, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0)
@@ -9051,7 +9051,7 @@ MU_FOR_EACH_1_1(X, P2)
#define MU_FOR_EACH_1_1(X, P1) \
X(P1)

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_,MU_C1(MU_COUNT_ARG(__VA_ARGS__))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_,MU_C1(MU_COUNT_ARG(__VA_ARGS__))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -9676,7 +9676,7 @@ MU_FOR_EACH_1_KEEP_1_1(X, keep, P2)
#define MU_FOR_EACH_1_KEEP_1_1(X, keep, P1) \
X(keep, P1)

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_1_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_1_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -10303,7 +10303,7 @@ X(keep1, keep2, P1)

#define MU_FOR_EACH_1_KEEP_2_0(...)

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_1_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_2_, MU_C2(MU_DEC,MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_1_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_2_, MU_C2(MU_DEC,MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -10622,7 +10622,7 @@ MU_FOR_EACH_2_KEEP_1_2(X, keep, P3, P4)
#define MU_FOR_EACH_2_KEEP_1_2(X, keep, P1, P2) \
X(keep, P1, P2) \

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_2_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_2_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -10942,7 +10942,7 @@ MU_FOR_EACH_2_KEEP_2_2(X, keep1, keep2, P3, P4)
#define MU_FOR_EACH_2_KEEP_2_2(X, keep1, keep2, P1, P2) \
X(keep1, keep2, P1, P2) \

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_2_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_2_, MU_C2(MU_DEC,MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_2_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_2_, MU_C2(MU_DEC, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -11948,6 +11948,7 @@ MU_FOR_EACH_1_COUNTED_123(X, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13,


#define MU_FOR_EACH_2_COUNTED_0(...)
+#define MU_FOR_EACH_2_COUNTED_1(...)

#define MU_FOR_EACH_2_COUNTED_2(X, P1, P2) \
X(2, P1, P2)
@@ -12197,7 +12198,7 @@ X(124, P1, P2) \
MU_FOR_EACH_2_COUNTED_122(X, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, P23, P24, P25, P26, P27, P28, P29, P30, P31, P32, P33, P34, P35, P36, P37, P38, P39, P40, P41, P42, P43, P44, P45, P46, P47, P48, P49, P50, P51, P52, P53, P54, P55, P56, P57, P58, P59, P60, P61, P62, P63, P64, P65, P66, P67, P68, P69, P70, P71, P72, P73, P74, P75, P76, P77, P78, P79, P80, P81, P82, P83, P84, P85, P86, P87, P88, P89, P90, P91, P92, P93, P94, P95, P96, P97, P98, P99, P100, P101, P102, P103, P104, P105, P106, P107, P108, P109, P110, P111, P112, P113, P114, P115, P116, P117, P118, P119, P120, P121, P122, P123, P124)


-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_, MU_C1(MU_COUNT_ARG(__VA_ARGS__))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
/*the COUNTED breed of MU_FOR_EACH macro invokes a macro with 3 parameters: 1st being the count of invocation. For example.
MU_FOR_EACH_2_COUNTER(MACRO, a,b,c,d,e,f) will result in
@@ -12219,7 +12220,7 @@ MU_FOR_EACH_2_REVERSE(X,a,b,c,d,e,f) => X(e,f) X(c,d) X (a, b) in this order */
#define MU_FOR_EACH_2_REVERSE(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_REVERSE_, MU_C1(MU_COUNT_ARG(__VA_ARGS__))) ( MACRO_TO_INVOKE, __VA_ARGS__)
#endif

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_EXPAND_OR_MU_C1(x) x
#else
#define MU_EXPAND_OR_MU_C1(...) __VA_ARGS__
diff --git a/macro_utils_h_generator/macro_utils_generated.tt b/macro_utils_h_generator/macro_utils_generated.tt
index 03890841a..627e672e4 100644
--- a/macro_utils_h_generator/macro_utils_generated.tt
+++ b/macro_utils_h_generator/macro_utils_generated.tt
@@ -69,7 +69,7 @@
#define MU_THE_NTH_ARG(<#for(var i=1;i<=nMacroParameters;i++)#>
<#{#>P<#=i#>, <#}#> ... ) P<#=nMacroParameters#>

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_COUNT_1_OR_MORE_ARG(...) MU_THE_NTH_ARG MU_LPAREN __VA_ARGS__, \
<#for(var i=nMacroParameters-1;i>=1;i--){#><#=i.ToString()+((i>1)?", ":"")#><#}#>)
#define MU_MORE_THAN_1_ARG(...) MU_THE_NTH_ARG MU_LPAREN __VA_ARGS__, <#for(var i=nMacroParameters-2;i>=1;i--){#><#=1#>,<#}#>0)
@@ -102,7 +102,7 @@ MU_FOR_EACH_1_<#=i-1#>(X, <#for(var j=2;j<=i;j++){#>P<#=j.ToString()+((j<i)?", "
#define MU_FOR_EACH_1_1(X, P1) \
X(P1)

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_,MU_C1(MU_COUNT_ARG(__VA_ARGS__))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_,MU_C1(MU_COUNT_ARG(__VA_ARGS__))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -120,7 +120,7 @@ MU_FOR_EACH_1_KEEP_1_<#=i-1#>(X, keep, <#for(var j=2;j<=i;j++){#>P<#=(j).ToStrin
#define MU_FOR_EACH_1_KEEP_1_1(X, keep, P1) \
X(keep, P1)

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_1_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_1_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -140,7 +140,7 @@ X(keep1, keep2, P1)

#define MU_FOR_EACH_1_KEEP_2_0(...)

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_1_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_2_, MU_C2(MU_DEC,MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_1_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_1_KEEP_2_, MU_C2(MU_DEC,MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -162,7 +162,7 @@ MU_FOR_EACH_2_KEEP_1_<#=i-2#>(X, keep, <#for(var j=3;j<=i;j++){#>P<#=(j).ToStrin
#define MU_FOR_EACH_2_KEEP_1_2(X, keep, P1, P2) \
X(keep, P1, P2) \

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_2_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_2_KEEP_1(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_1_, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__)))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -185,7 +185,7 @@ MU_FOR_EACH_2_KEEP_2_<#=i-2#>(X, keep1, keep2, <#for(var j=3;j<=i;j++){#>P<#=(j)
#define MU_FOR_EACH_2_KEEP_2_2(X, keep1, keep2, P1, P2) \
X(keep1, keep2, P1, P2) \

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_2_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_2_, MU_C2(MU_DEC,MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
#else
#define MU_FOR_EACH_2_KEEP_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_KEEP_2_, MU_C2(MU_DEC, MU_C2(MU_DEC,MU_C1(MU_COUNT_ARG(__VA_ARGS__))))) ( MACRO_TO_INVOKE, __VA_ARGS__)
@@ -229,6 +229,7 @@ MU_FOR_EACH_1_COUNTED_<#=i-1#>(X, <#for(var j=2;j<=i;j++){#>P<#=j.ToString()+((j
<#}#>

#define MU_FOR_EACH_2_COUNTED_0(...)
+#define MU_FOR_EACH_2_COUNTED_1(...)

#define MU_FOR_EACH_2_COUNTED_2(X, P1, P2) \
X(2, P1, P2)
@@ -240,7 +241,7 @@ MU_FOR_EACH_2_COUNTED_<#=i-2#>(X, <#for(var j=3;j<=i;j++){#>P<#=j.ToString()+((j

<#}#>

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_FOR_EACH_2(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_, MU_C1(MU_COUNT_ARG(__VA_ARGS__))) MU_LPAREN MACRO_TO_INVOKE, __VA_ARGS__)
/*the COUNTED breed of MU_FOR_EACH macro invokes a macro with 3 parameters: 1st being the count of invocation. For example.
MU_FOR_EACH_2_COUNTER(MACRO, a,b,c,d,e,f) will result in
@@ -262,7 +263,7 @@ MU_FOR_EACH_2_REVERSE(X,a,b,c,d,e,f) => X(e,f) X(c,d) X (a, b) in this order */
#define MU_FOR_EACH_2_REVERSE(MACRO_TO_INVOKE, ...) MU_C2(MU_FOR_EACH_2_REVERSE_, MU_C1(MU_COUNT_ARG(__VA_ARGS__))) ( MACRO_TO_INVOKE, __VA_ARGS__)
#endif

-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(__clang__)
#define MU_EXPAND_OR_MU_C1(x) x
#else
#define MU_EXPAND_OR_MU_C1(...) __VA_ARGS__
2 changes: 2 additions & 0 deletions ports/azure-macro-utils-c/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ vcpkg_from_github(
SHA512 8f9fd02012202db6cff5b647edbc8332a2c03963e80182a630af6a884f23df96b8e24d60e5412bfc2a0a7f43240a54f9597040aa28a9d3e1566755e1d52aac62
HEAD_REF master
FILE_DISAMBIGUATOR 1
PATCHES
ifdef-clang-cl.patch
)

vcpkg_cmake_configure(
Expand Down
22 changes: 22 additions & 0 deletions ports/azure-storage-cpp/fix-clang-cl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
index 276f10b14d..8afe0646be 100644
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
@@ -93,7 +93,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
add_definitions(-DBOOST_LOG_DYN_LINK)
endif()
add_definitions(-D_TURN_OFF_PLATFORM_STRING)
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC)
message("-- Setting clang options")

set(WARNINGS "-Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls")
@@ -109,7 +109,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_definitions(-DBOOST_LOG_DYN_LINK)
endif()
add_definitions(-D_TURN_OFF_PLATFORM_STRING)
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+elseif(MSVC)
message("-- Setting MSVC options")
add_compile_options(/bigobj)
add_compile_options(/MP)
2 changes: 2 additions & 0 deletions ports/azure-storage-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ vcpkg_from_github(
SHA512 83eabcaf2114c8af1cabbc96b6ef2b57c934a06f68e7a870adf336feaa19edd57aedaf8507d5c40500e46d4e77f5059f9286e319fe7cadeb9ffc8fa018fb030c
HEAD_REF master
PATCHES
fix-clang-cl.patch
fix-asio-error.patch

)

vcpkg_replace_string("${SOURCE_PATH}/Microsoft.WindowsAzure.Storage/CMakeLists.txt" [[file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)]] "")
Expand Down
17 changes: 17 additions & 0 deletions ports/blitz/fix-include-llvm.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/blitz/bzconfig.h b/blitz/bzconfig.h
index 17d30b8471..4d375cdc9a 100644
--- a/blitz/bzconfig.h
+++ b/blitz/bzconfig.h
@@ -51,8 +51,11 @@

#elif defined(_MSC_VER)
/* Microsoft VS.NET compiler */
+#ifdef __clang__
+#include <blitz/llvm/bzconfig.h>
+#else
#include <blitz/ms/bzconfig.h>
-
+#endif
#elif defined(__xlC__)
/* IBM xlC compiler */
#include <blitz/ibm/bzconfig.h>
2 changes: 2 additions & 0 deletions ports/blitz/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF 839fc5e0f35b1c38a01cfd7a94e83de81e8a6b55
SHA512 efb6b19691e23c95cf6abd59607bce299b0c02a12ce6be105a35ad8509ab564b8dac8d6363f048e547d199e117d2bdd0e4ef3046d3c411f669c0a453a0b75627
HEAD_REF master
PATCHES
fix-include-llvm.patch
)

vcpkg_find_acquire_program(PYTHON3)
Expand Down
2 changes: 1 addition & 1 deletion ports/blitz/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "blitz",
"version-date": "2020-03-25",
"port-version": 7,
"port-version": 8,
"description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.",
"homepage": "https://github.com/blitzpp/blitz",
"supports": "!(arm | arm64 | uwp)",
Expand Down
13 changes: 13 additions & 0 deletions ports/c4core/disable_cpack.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba9983c32e..4346f8d23d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,7 @@ endif()
c4_add_dev_targets()

if(C4CORE_INSTALL)
- c4_pack_project(TYPE LIBRARY)
+ #c4_pack_project(TYPE LIBRARY)
endif()


Loading
Loading