зеркало из https://github.com/Azure/sf-c-util.git
New deps and use jemalloc from vcpkg (#174)
* Update dependencies * Add vcpkg * Use vcpkg for jemalloc build * Use the right vcpkg
This commit is contained in:
Родитель
7d7e932571
Коммит
3bbdc33fb5
|
@ -28,3 +28,6 @@
|
|||
[submodule "deps/smhasher"]
|
||||
path = deps/smhasher
|
||||
url = https://github.com/hcoona/smhasher.git
|
||||
[submodule "deps/vcpkg"]
|
||||
path = deps/vcpkg
|
||||
url = https://github.com/microsoft/vcpkg.git
|
||||
|
|
|
@ -48,6 +48,11 @@ if ((NOT TARGET c_build_tools) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/c-buil
|
|||
set_default_build_options()
|
||||
endif()
|
||||
|
||||
if ((WIN32) AND ("${GBALLOC_LL_TYPE}" STREQUAL "JEMALLOC"))
|
||||
# Bring in vcpkg
|
||||
use_vcpkg(${CMAKE_CURRENT_LIST_DIR}/deps/vcpkg)
|
||||
endif()
|
||||
|
||||
if ((NOT TARGET macro_utils_c) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/macro-utils-c/CMakeLists.txt))
|
||||
add_subdirectory(deps/macro-utils-c)
|
||||
include_directories(${MACRO_UTILS_INC_FOLDER})
|
||||
|
|
|
@ -9,121 +9,7 @@ resources:
|
|||
endpoint: github.com_azure
|
||||
ref: refs/heads/master
|
||||
jobs:
|
||||
- job: windowsx64debug
|
||||
displayName: 'Build Windows x64 Debug'
|
||||
pool:
|
||||
name: Azure-MessagingStore-WinBuildPoolVS2022
|
||||
demands:
|
||||
- Build
|
||||
- Cmd
|
||||
- msbuild
|
||||
- visualstudio
|
||||
|
||||
steps:
|
||||
- task: BatchScript@1
|
||||
displayName: 'Git submodule update'
|
||||
inputs:
|
||||
filename: 'C:\Program Files\Git\bin\git.exe'
|
||||
arguments: 'submodule update --init --force'
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'Git submodule clean'
|
||||
inputs:
|
||||
filename: 'C:\Program Files\Git\bin\git.exe'
|
||||
arguments: 'submodule foreach --recursive "git clean -xdff"'
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'Git clean'
|
||||
inputs:
|
||||
filename: 'C:\Program Files\Git\bin\git.exe'
|
||||
arguments: 'clean -xdff'
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'Setup VS Vars'
|
||||
inputs:
|
||||
filename: '"c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"'
|
||||
modifyEnvironment: true
|
||||
|
||||
- task: CMake@1
|
||||
displayName: 'CMake .. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=OFF -Dabort_on_fail:bool=ON -Duse_vld:bool=ON -G "Visual Studio 17 2022" -A x64'
|
||||
inputs:
|
||||
workingDirectory: 'build_x64'
|
||||
cmakeArgs: '.. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=OFF -Dabort_on_fail:bool=ON -Duse_vld:bool=ON -G "Visual Studio 17 2022" -A x64'
|
||||
|
||||
- task: VSBuild@1
|
||||
displayName: 'Build solution build_x64\*.sln'
|
||||
inputs:
|
||||
solution: 'build_x64\*.sln'
|
||||
msbuildArgs: '/t:restore /t:build'
|
||||
platform: x64
|
||||
configuration: Debug
|
||||
maximumCpuCount: true
|
||||
|
||||
- task: CmdLine@1
|
||||
displayName: 'Run ctest'
|
||||
inputs:
|
||||
filename: ctest
|
||||
arguments: '-C "Debug" -V --output-on-failure'
|
||||
workingFolder: 'build_x64'
|
||||
|
||||
- job: windowsx64relwithdebinfo
|
||||
displayName: 'Build Windows x64 RelWithDebInfo'
|
||||
pool:
|
||||
name: Azure-MessagingStore-WinBuildPoolVS2022
|
||||
demands:
|
||||
- Build
|
||||
- Cmd
|
||||
- msbuild
|
||||
- visualstudio
|
||||
- vstest
|
||||
|
||||
steps:
|
||||
- task: BatchScript@1
|
||||
displayName: 'Git submodule update'
|
||||
inputs:
|
||||
filename: 'C:\Program Files\Git\bin\git.exe'
|
||||
arguments: 'submodule update --init --force'
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'Git submodule clean'
|
||||
inputs:
|
||||
filename: 'C:\Program Files\Git\bin\git.exe'
|
||||
arguments: 'submodule foreach --recursive "git clean -xdff"'
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'Git clean'
|
||||
inputs:
|
||||
filename: 'C:\Program Files\Git\bin\git.exe'
|
||||
arguments: 'clean -xdff'
|
||||
|
||||
- task: BatchScript@1
|
||||
displayName: 'Setup VS Vars'
|
||||
inputs:
|
||||
filename: '"c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"'
|
||||
modifyEnvironment: true
|
||||
|
||||
- task: CMake@1
|
||||
displayName: 'CMake .. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=ON -Dabort_on_fail:bool=ON -G "Visual Studio 17 2022" -A x64'
|
||||
inputs:
|
||||
workingDirectory: 'build_x64'
|
||||
cmakeArgs: '.. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=ON -Dabort_on_fail:bool=ON -G "Visual Studio 17 2022" -A x64'
|
||||
|
||||
- task: VSBuild@1
|
||||
displayName: 'Build solution build_x64\*.sln'
|
||||
inputs:
|
||||
solution: 'build_x64\*.sln'
|
||||
msbuildArgs: '/t:restore /t:build'
|
||||
configuration: RelWithDebInfo
|
||||
maximumCpuCount: true
|
||||
|
||||
- task: VSTest@2
|
||||
displayName: 'VsTest - testAssemblies'
|
||||
inputs:
|
||||
testAssemblyVer2: |
|
||||
**\*_ut_*.dll
|
||||
**\*_int_*.dll
|
||||
**\*_perf_*.dll
|
||||
runTestsInIsolation: true
|
||||
- template: /pipeline_templates/build_all_flavors.yml@c_build_tools
|
||||
|
||||
- template: /pipeline_templates/codeql3000_default.yml@c_build_tools
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 6ed0ca6240e43ffbd5391e9f7e5aa413b9f195e5
|
||||
Subproject commit 21532bc90ff9e1159db7574028ec4beeca60f6fe
|
|
@ -1 +1 @@
|
|||
Subproject commit 158590ceac03dd7f4de885bc047ffab3cd156b16
|
||||
Subproject commit 37e12972674da2370604bb5c61686531b40c6e24
|
|
@ -1 +1 @@
|
|||
Subproject commit 104fc152924dbfb0d190781bfd4c34f0f6b560e8
|
||||
Subproject commit 25dde54813e1ba00131ea5bf9dc0e6e5cbf00882
|
|
@ -1 +1 @@
|
|||
Subproject commit 9e6dbf9a2d59c8e3098298f23f029ba605f00384
|
||||
Subproject commit ef0cd74ab2cc61dff967cbdef18c0863d944d9d0
|
|
@ -1 +1 @@
|
|||
Subproject commit 7e78f543578a4bb18187a6c11be2ab355370db6f
|
||||
Subproject commit 07d03c6ce97ae33bcc42a80aa406601e20d5fd25
|
|
@ -1 +1 @@
|
|||
Subproject commit ca3e925082e52a8355778cb680b98d95d8761bb8
|
||||
Subproject commit f873ad087e40a44948bb860a239ce9bfce38ac15
|
|
@ -1 +1 @@
|
|||
Subproject commit 5837e9cec5027c5553eae044b226956108295a81
|
||||
Subproject commit 85dc940cefe2e21acb664819564ca4703cf6ff2a
|
|
@ -1 +1 @@
|
|||
Subproject commit 9ffa56e987ac017e7dd8b1b89b70249546cc1d1e
|
||||
Subproject commit 7b014ae46c7036f88ac9eb7307b476e3cf9823b7
|
|
@ -1 +1 @@
|
|||
Subproject commit acc12e12f9c56da6ffbcfd0b8cb4f5a35d7a2a77
|
||||
Subproject commit 30035fa0a8882c0c52b4d405e66793e14d0338f0
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 0719a71389654b88d827501d88e37e58ea8cbd70
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "c-pal",
|
||||
"version": "1.0.0",
|
||||
"dependencies": [
|
||||
"pkgconf",
|
||||
"jemalloc"
|
||||
]
|
||||
}
|
Загрузка…
Ссылка в новой задаче