From 66cb51f57a4e9ebc602159249498d9fbd5ccda50 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 1 Feb 2022 09:22:18 +0800 Subject: [PATCH 1/2] Set required macro of Hunter curl dependency globally to fix PCH issue --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8bc4af3e..580b3e082 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,9 @@ IF(HUNTER_ENABLED) SET(WITH_STATIC_LIBXML2 ON CACHE BOOL "static libxml2" FORCE) SET(WITH_STATIC_EXTERNAL ON CACHE BOOL "static external" FORCE) SET(WITH_EXTERNAL OFF CACHE BOOL "external libs" FORCE) + + # Workaround for PCH compilation issue, from curl intsizeof depencency + ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS) ENDIF() From 2f1ce0af640d4d247d76a834afb2be09f8fe50df Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 1 Feb 2022 09:51:07 +0800 Subject: [PATCH 2/2] Switch to ryzomcore luabind --- CMakeModules/HunterConfig.cmake | 4 ++-- azure-pipelines.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/HunterConfig.cmake b/CMakeModules/HunterConfig.cmake index 144eeeb6a..dcc8cf91a 100644 --- a/CMakeModules/HunterConfig.cmake +++ b/CMakeModules/HunterConfig.cmake @@ -2,7 +2,7 @@ hunter_config(luabind VERSION 0.9.1 - URL "https://github.com/nimetu/luabind/tarball/2fa4606" - SHA1 "3b4646bab9f0b2362d7b8d71d78e40deaf3cc747" + URL "https://github.com/ryzom/luabind/tarball/3dd7c545034219eaea322feb15903524085e94df" + SHA1 "27a08c61b5eab3fed78115288bcca3be9aae581d" ) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6894e2055..8a29f4d92 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -127,7 +127,7 @@ jobs: condition: contains(variables['cmakeExtra'], 'DIRECT3D=ON') - task: Cache@2 inputs: - key: 'hunter321-$(releaseName)' + key: 'hunter321b-$(releaseName)' path: '$(Pipeline.Workspace)/.hunter/_Base/Cache' - task: CMake@1 displayName: 'Configure'