Update submodule to use sdk submodules for testing
This commit is contained in:
Родитель
eb9abb75e0
Коммит
431d8fa083
|
@ -1,9 +1,3 @@
|
|||
[submodule "deps/umock-c"]
|
||||
path = deps/umock-c
|
||||
url = https://github.com/Azure/umock-c.git
|
||||
[submodule "deps/azure-c-testrunnerswitcher"]
|
||||
path = deps/azure-c-testrunnerswitcher
|
||||
url = https://github.com/Azure/azure-c-testrunnerswitcher.git
|
||||
[submodule "deps/azure-ctest"]
|
||||
path = deps/azure-ctest
|
||||
url = https://github.com/Azure/azure-ctest.git
|
||||
|
|
|
@ -6,14 +6,12 @@ project(azure_iot_c_back_compat)
|
|||
|
||||
set(sdk_branch "master" CACHE STRING "Full path to custom HSM repo library")
|
||||
|
||||
option(use_installed_dependencies "use_installed_dependencies to ON to use installed packages instead of building dependencies from submodules" ON)
|
||||
option(use_installed_dependencies "use_installed_dependencies to ON to use installed packages instead of building dependencies from submodules" OFF)
|
||||
option(skip_samples "set skip_samples to ON to skip building samples (default is ON)[if possible, they are always build]" ON)
|
||||
option(use_prov_client "Enable provisioning client" ON)
|
||||
|
||||
enable_testing()
|
||||
|
||||
# Submodules
|
||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-c-testrunnerswitcher)
|
||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-ctest)
|
||||
|
||||
if (${use_installed_dependencies})
|
||||
set(AZUREIOT_INC_FOLDER
|
||||
"/usr/local/include/azureiot"
|
||||
|
@ -22,12 +20,7 @@ if (${use_installed_dependencies})
|
|||
)
|
||||
else()
|
||||
# do not add or build any tests of the dependencies
|
||||
set(run_e2e_tests OFF)
|
||||
set(run_unittests OFF)
|
||||
set(skip_samples ON)
|
||||
set(use_prov_client ON)
|
||||
# Set the custom HSM that we will be using
|
||||
set(hsm_type_custom ON)
|
||||
set(hsm_type_custom ON CACHE BOOL "hsm type of custom used with the Provisioning client")
|
||||
|
||||
if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-iot-sdk-c/CMakeLists.txt")
|
||||
message("Cloning Azure Iot SDK C...")
|
||||
|
@ -40,6 +33,12 @@ else()
|
|||
"${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-iot-sdk-c/iothub_service_client/inc"
|
||||
)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-iot-sdk-c/deps/parson)
|
||||
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-iot-sdk-c/c-utility/inc")
|
||||
|
||||
# Need to use the azure deps for testrunnerswitcher and ctest so you don't have to update these
|
||||
# everytime you update the sdk
|
||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-iot-sdk-c/deps/azure-c-testrunnerswitcher)
|
||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deps/azure-iot-sdk-c/deps/azure-ctest)
|
||||
endif()
|
||||
|
||||
IF(WIN32)
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Subproject commit a5e1543387c41c58e3bf8a439b18e755b7e5c904
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 5afd053eb0a3fb10a64f4b9d7a2efa7126d37c88
|
|
@ -34,9 +34,9 @@ include_directories(${IOTHUB_SERVICE_CLIENT_INC_FOLDER})
|
|||
if (TARGET ${theseTestsName}_exe)
|
||||
target_link_libraries(${theseTestsName}_exe
|
||||
iothub_client
|
||||
iothub_client_http_transport
|
||||
prov_auth_client
|
||||
hsm_security_client
|
||||
iothub_client_http_transport
|
||||
iothub_service_client
|
||||
uamqp
|
||||
aziotsharedutil
|
||||
|
@ -48,9 +48,9 @@ if (WIN32)
|
|||
if(TARGET ${theseTestsName}_dll)
|
||||
target_link_libraries(${theseTestsName}_dll
|
||||
iothub_client
|
||||
iothub_client_http_transport
|
||||
prov_auth_client
|
||||
hsm_security_client
|
||||
iothub_client_http_transport
|
||||
iothub_service_client
|
||||
uamqp
|
||||
aziotsharedutil
|
||||
|
|
|
@ -34,9 +34,9 @@ include_directories(${IOTHUB_SERVICE_CLIENT_INC_FOLDER})
|
|||
if (TARGET ${theseTestsName}_exe)
|
||||
target_link_libraries(${theseTestsName}_exe
|
||||
iothub_client
|
||||
iothub_client_mqtt_transport
|
||||
prov_auth_client
|
||||
hsm_security_client
|
||||
iothub_client_mqtt_transport
|
||||
iothub_service_client
|
||||
uamqp
|
||||
umqtt
|
||||
|
@ -49,9 +49,9 @@ if (WIN32)
|
|||
if(TARGET ${theseTestsName}_dll)
|
||||
target_link_libraries(${theseTestsName}_dll
|
||||
iothub_client
|
||||
iothub_client_mqtt_transport
|
||||
prov_auth_client
|
||||
hsm_security_client
|
||||
iothub_client_mqtt_transport
|
||||
iothub_service_client
|
||||
uamqp
|
||||
umqtt
|
||||
|
|
Загрузка…
Ссылка в новой задаче