From de39cbc17ff6232e7a42b41344d2e4e42acb08c7 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 14:09:47 +0200 Subject: [PATCH 1/6] don't fallback to msvc https://docs.conan.io/1/reference/config_files/global_conf.html --- global.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/global.conf b/global.conf index c945886..3c65c93 100644 --- a/global.conf +++ b/global.conf @@ -8,3 +8,4 @@ tools.gnu:define_libcxx11_abi = True # Otherwise .bat files are created. Maybe we should define this on a recipe basis: # #{% if platform.system() == 'Windows' %}tools.env.virtualenv:powershell=True{% endif %} +{% if platform.system() == 'Windows' %}core.package_id:msvc_visual_incompatible{% endif %} From 72129d9a223b4119f2bbdb50ae256564ec8c2c3a Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 14:11:33 +0200 Subject: [PATCH 2/6] Update global.conf --- global.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.conf b/global.conf index 3c65c93..3d82770 100644 --- a/global.conf +++ b/global.conf @@ -8,4 +8,4 @@ tools.gnu:define_libcxx11_abi = True # Otherwise .bat files are created. Maybe we should define this on a recipe basis: # #{% if platform.system() == 'Windows' %}tools.env.virtualenv:powershell=True{% endif %} -{% if platform.system() == 'Windows' %}core.package_id:msvc_visual_incompatible{% endif %} +{% if platform.system() == 'Windows' %}core.package_id:msvc_visual_incompatible=True{% endif %} From b96f13066299c6f170e4a25219b4693f6916896f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 14:12:17 +0200 Subject: [PATCH 3/6] Update global.conf --- global.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/global.conf b/global.conf index 3d82770..c945886 100644 --- a/global.conf +++ b/global.conf @@ -8,4 +8,3 @@ tools.gnu:define_libcxx11_abi = True # Otherwise .bat files are created. Maybe we should define this on a recipe basis: # #{% if platform.system() == 'Windows' %}tools.env.virtualenv:powershell=True{% endif %} -{% if platform.system() == 'Windows' %}core.package_id:msvc_visual_incompatible=True{% endif %} From e6aac82ac8f456a4dbcfcacf77f20b26626d61ad Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 16:56:25 +0200 Subject: [PATCH 4/6] Update cura.jinja --- profiles/cura.jinja | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/cura.jinja b/profiles/cura.jinja index 9744cca..d9da90a 100644 --- a/profiles/cura.jinja +++ b/profiles/cura.jinja @@ -7,6 +7,7 @@ compiler.cppstd=17 curaengine:compiler.cppstd=20 curaengine*:compiler.cppstd=20 curaengine_plugin_infill_generate:compiler.cppstd=20 +curaengine_plugin_gradual_flow:compiler.cppstd=20 scripta:compiler.cppstd=20 umspatial*:compiler.cppstd=20 From 1d795bf73469643682c2dd2712982d983adef02c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 29 Aug 2023 16:57:04 +0200 Subject: [PATCH 5/6] Update cura.jinja --- profiles/cura.jinja | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/cura.jinja b/profiles/cura.jinja index d9da90a..13ae920 100644 --- a/profiles/cura.jinja +++ b/profiles/cura.jinja @@ -8,6 +8,7 @@ curaengine:compiler.cppstd=20 curaengine*:compiler.cppstd=20 curaengine_plugin_infill_generate:compiler.cppstd=20 curaengine_plugin_gradual_flow:compiler.cppstd=20 +curaengine_grpc_definitions:compiler.cppstd=20 scripta:compiler.cppstd=20 umspatial*:compiler.cppstd=20 From e278e2e495b0f0a467d8bec697f03159f33e8f4c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 31 Aug 2023 05:06:57 +0200 Subject: [PATCH 6/6] Don't skip the tests Contributes to CURA-10951 --- global.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/global.conf b/global.conf index c945886..33886ac 100644 --- a/global.conf +++ b/global.conf @@ -3,6 +3,7 @@ core:default_build_profile = cura_build.jinja tools.cmake.cmaketoolchain:generator = Ninja tools.env.virtualenv:auto_use = True tools.gnu:define_libcxx11_abi = True +tools.build:skip_test = False # FIXME: Needs to be commented out for OpenSSL to work but if we wan't to create ps1 scripts it needs to be set to True # Otherwise .bat files are created. Maybe we should define this on a recipe basis: