Merge branch 'core4' into feature/quick-start-py

feature/quick-start-py
kaetemi 3 years ago
commit 9f2d08fdc1
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -53,6 +53,9 @@ IF(HUNTER_ENABLED)
SET(WITH_STATIC_LIBXML2 ON CACHE BOOL "static libxml2" FORCE) SET(WITH_STATIC_LIBXML2 ON CACHE BOOL "static libxml2" FORCE)
SET(WITH_STATIC_EXTERNAL ON CACHE BOOL "static external" FORCE) SET(WITH_STATIC_EXTERNAL ON CACHE BOOL "static external" FORCE)
SET(WITH_EXTERNAL OFF CACHE BOOL "external libs" 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() ENDIF()

@ -2,7 +2,7 @@
hunter_config(luabind hunter_config(luabind
VERSION 0.9.1 VERSION 0.9.1
URL "https://github.com/nimetu/luabind/tarball/2fa4606" URL "https://github.com/ryzom/luabind/tarball/3dd7c545034219eaea322feb15903524085e94df"
SHA1 "3b4646bab9f0b2362d7b8d71d78e40deaf3cc747" SHA1 "27a08c61b5eab3fed78115288bcca3be9aae581d"
) )

@ -127,7 +127,7 @@ jobs:
condition: contains(variables['cmakeExtra'], 'DIRECT3D=ON') condition: contains(variables['cmakeExtra'], 'DIRECT3D=ON')
- task: Cache@2 - task: Cache@2
inputs: inputs:
key: 'hunter321-$(releaseName)' key: 'hunter321b-$(releaseName)'
path: '$(Pipeline.Workspace)/.hunter/_Base/Cache' path: '$(Pipeline.Workspace)/.hunter/_Base/Cache'
- task: CMake@1 - task: CMake@1
displayName: 'Configure' displayName: 'Configure'

Loading…
Cancel
Save