зеркало из https://github.com/Azure/c-logging.git
use c build tools (#20)
* git rm azure-c-build-tools * git submodule add https://github.com/Azure/c-build-tools * use latest macro utils * rename inside files * remove azure-macro-utils-c * added macro-utils-c * use macro_utils the new
This commit is contained in:
Родитель
782ff7dc2e
Коммит
efff47e26c
|
@ -1,6 +1,6 @@
|
|||
[submodule "deps/azure-c-build-tools"]
|
||||
path = deps/azure-c-build-tools
|
||||
url = https://github.com/Azure/azure-c-build-tools.git
|
||||
[submodule "deps/azure-macro-utils-c"]
|
||||
path = deps/azure-macro-utils-c
|
||||
url = https://github.com/Azure/azure-macro-utils-c.git
|
||||
[submodule "deps/c-build-tools"]
|
||||
path = deps/c-build-tools
|
||||
url = https://github.com/Azure/c-build-tools
|
||||
[submodule "deps/macro-utils-c"]
|
||||
path = deps/macro-utils-c
|
||||
url = https://github.com/Azure/macro-utils-c
|
||||
|
|
|
@ -45,13 +45,13 @@ set(run_perf_tests OFF)
|
|||
set(run_unittests OFF)
|
||||
set(run_traceability OFF)
|
||||
|
||||
if ((NOT TARGET azure_c_build_tools) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-c-build-tools/CMakeLists.txt))
|
||||
add_subdirectory(deps/azure-c-build-tools)
|
||||
if ((NOT TARGET c_build_tools) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/c-build-tools/CMakeLists.txt))
|
||||
add_subdirectory(deps/c-build-tools)
|
||||
set_default_build_options()
|
||||
endif()
|
||||
|
||||
if ((NOT TARGET azure_macro_utils_c) AND (EXISTS ${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt))
|
||||
add_subdirectory(deps/azure-macro-utils-c)
|
||||
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})
|
||||
endif()
|
||||
|
||||
|
|
|
@ -285,7 +285,7 @@ jobs:
|
|||
- task: NuGetCommand@2
|
||||
displayName: 'NuGet restore'
|
||||
inputs:
|
||||
restoreSolution: deps/azure-c-build-tools/traceabilitytool/traceabilitytool.sln
|
||||
restoreSolution: deps/c-build-tools/traceabilitytool/traceabilitytool.sln
|
||||
|
||||
- task: CMake@1
|
||||
displayName: CMake
|
||||
|
@ -307,7 +307,7 @@ jobs:
|
|||
- task: BatchScript@1
|
||||
displayName: 'Run traceability tool'
|
||||
inputs:
|
||||
filename: 'build/deps/azure-c-build-tools/traceabilitytool/RelWithDebInfo/traceabilitytool.exe'
|
||||
filename: 'build/deps/c-build-tools/traceabilitytool/RelWithDebInfo/traceabilitytool.exe'
|
||||
arguments: '-i $(Build.SourcesDirectory) -buildcheck -e deps'
|
||||
modifyEnvironment: false
|
||||
workingFolder: '$(Build.SourcesDirectory)'
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 4e903337052dd19275da3832453bed0e2a783563
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 80c9eff2eb01368ef07a55bf2851348f458e78fc
|
|
@ -0,0 +1 @@
|
|||
Subproject commit b75de4eb6f2f5802045c68b062aa0e3293cd9e35
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 39be380162040dc8df723105c857552f6279e8da
|
|
@ -10,7 +10,7 @@
|
|||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include "azure_macro_utils/macro_utils.h"
|
||||
#include "macro_utils/macro_utils.h"
|
||||
|
||||
#ifdef LOGERROR_CAPTURES_STACK_TRACES
|
||||
#include "azure_c_logging/logging_stacktrace.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче