refactor prov client CMake (#2152)

CMakeLists.txt

@@ -198,7 +198,10 @@ if(NOT ${use_installed_dependencies})
       set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
   endif()
 
-  target_include_directories(parson PUBLIC $<INSTALL_INTERFACE:include>)
+  target_include_directories(parson PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/deps/parson>
+      $<INSTALL_INTERFACE:include>
+  )
   set_target_properties(parson PROPERTIES PUBLIC_HEADER ${CMAKE_CURRENT_LIST_DIR}/deps/parson/parson.h)
 
   install(

provisioning_client/CMakeLists.txt

@@ -8,37 +8,28 @@ compileAsC99()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_PROV_MODULE")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_PROV_MODULE")
 
-add_subdirectory(./deps)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps)
 
 set(provisioning_libs)
 set(provisioning_headers)
 
 set(AUTH_CLIENT_H_FILES
-    ./inc/azure_prov_client/internal/prov_auth_client.h
-    ./inc/azure_prov_client/prov_security_factory.h
-    ./inc/azure_prov_client/internal/iothub_auth_client.h
-    ./inc/azure_prov_client/internal/prov_auth_client.h
-    ./inc/azure_prov_client/iothub_security_factory.h
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_auth_client.h
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_security_factory.h
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/iothub_auth_client.h
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_auth_client.h
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/iothub_security_factory.h
     )
 
-set(AUTH_CLIENT_C_FILES
-    ./src/prov_auth_client.c
-    ./src/prov_security_factory.c
-    ./src/iothub_auth_client.c
-    ./src/iothub_security_factory.c)
-
 set(HSM_CLIENT_LIBRARY)
 
 set(HSM_CLIENT_H_FILES
-    ./adapters/hsm_client_data.h)
-set(HSM_CLIENT_C_FILES
-    ./adapters/hsm_client_data.c)
+    ${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_data.h
+)
 
 if (${hsm_type_custom})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHSM_AUTH_TYPE_CUSTOM")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHSM_AUTH_TYPE_CUSTOM")
-
-    set(HSM_CLIENT_LIBRARY ${CUSTOM_HSM_LIB})
 elseif (${use_prov_client})
     if (${run_e2e_tests})
         # For e2e test we need to run a custom HSM to handle testing
@@ -55,20 +46,16 @@ elseif (${use_prov_client})
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHSM_TYPE_SYMM_KEY")
         endif()
 
+        # TODO: Remove once utpm CMake is updated
         include_directories(${TPM_C_INC_FOLDER})
 
         # Include the riot directories
-        include_directories(./deps/RIoT/Simulation/DICE)
-        include_directories(./deps/RIoT/Simulation/RIoT/Core)
-        include_directories(./deps/RIoT/Simulation/RIoT/Core/RIoTCrypt/include)
+        include_directories(${CMAKE_CURRENT_LIST_DIR}/deps/RIoT/Simulation/DICE)
+        include_directories(${CMAKE_CURRENT_LIST_DIR}/deps/RIoT/Simulation/RIoT/Core)
+        include_directories(${CMAKE_CURRENT_LIST_DIR}/deps/RIoT/Simulation/RIoT/Core/RIoTCrypt/include)
 
         # For e2e test a custom HSM is needed
-        add_subdirectory(./tests/common_prov_e2e/prov_hsm)
-
-        set(HSM_CLIENT_LIBRARY ${HSM_CLIENT_LIBRARY} msr_riot utpm prov_hsm)
-        if (WIN32)
-            set(HSM_CLIENT_LIBRARY ${HSM_CLIENT_LIBRARY} Tbs)
-        endif ()
+        add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tests/common_prov_e2e/prov_hsm)
     else ()
         if (${hsm_type_x509})
             # Using x509
@@ -76,16 +63,12 @@ elseif (${use_prov_client})
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHSM_TYPE_X509")
 
             set(HSM_CLIENT_H_FILES ${HSM_CLIENT_H_FILES}
-                ./adapters/hsm_client_riot.h)
-            set(HSM_CLIENT_C_FILES ${HSM_CLIENT_C_FILES}
-                ./adapters/hsm_client_riot.c)
+                ${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_riot.h)
 
             # Include the riot directories
-            include_directories(./deps/RIoT/Simulation/DICE)
-            include_directories(./deps/RIoT/Simulation/RIoT/Core)
-            include_directories(./deps/RIoT/Simulation/RIoT/Core/RIoTCrypt/include)
-
-            set(HSM_CLIENT_LIBRARY ${HSM_CLIENT_LIBRARY} msr_riot)
+            include_directories(${CMAKE_CURRENT_LIST_DIR}/deps/RIoT/Simulation/DICE)
+            include_directories(${CMAKE_CURRENT_LIST_DIR}/deps/RIoT/Simulation/RIoT/Core)
+            include_directories(${CMAKE_CURRENT_LIST_DIR}/deps/RIoT/Simulation/RIoT/Core/RIoTCrypt/include)
         endif()
 
         if (${hsm_type_sastoken})
@@ -94,21 +77,15 @@ elseif (${use_prov_client})
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHSM_TYPE_SAS_TOKEN")
 
             set(HSM_CLIENT_H_FILES ${HSM_CLIENT_H_FILES}
-                ./adapters/hsm_client_tpm.h)
-            set(HSM_CLIENT_C_FILES ${HSM_CLIENT_C_FILES}
-                ./adapters/hsm_client_tpm.c)
+                ${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_tpm.h)
 
             if (${use_tpm_simulator})
                 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_EMULATOR_MODULE")
                 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_EMULATOR_MODULE")
             endif()
 
+            # TODO: Remove once utpm CMake is updated
             include_directories(${TPM_C_INC_FOLDER})
-
-            set(HSM_CLIENT_LIBRARY ${HSM_CLIENT_LIBRARY} utpm)
-            if (WIN32)
-                set(HSM_CLIENT_LIBRARY ${HSM_CLIENT_LIBRARY} Tbs)
-            endif ()
         endif ()
 
         if (${hsm_type_symm_key})
@@ -116,9 +93,7 @@ elseif (${use_prov_client})
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHSM_TYPE_SYMM_KEY")
 
             set(HSM_CLIENT_H_FILES ${HSM_CLIENT_H_FILES} 
-                ./adapters/hsm_client_key.h)
-            set(HSM_CLIENT_C_FILES ${HSM_CLIENT_C_FILES} 
-                ./adapters/hsm_client_key.c)
+                ${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_key.h)
         endif()
     endif ()
 endif ()
@@ -128,48 +103,29 @@ if (${hsm_type_edge_module})
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHSM_TYPE_HTTP_EDGE")
 
     set(HSM_CLIENT_H_FILES ${HSM_CLIENT_H_FILES}
-        ./adapters/hsm_client_http_edge.h)
-    set(HSM_CLIENT_C_FILES ${HSM_CLIENT_C_FILES}
-        ./adapters/hsm_client_http_edge.c)
-
-    set(HSM_CLIENT_LIBRARY ${HSM_CLIENT_LIBRARY} uhttp)
+        ${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_http_edge.h)
 endif()
 
-
-function(link_security_client whatExeIsBuilding)
-    target_link_libraries(${whatExeIsBuilding} prov_auth_client)
-    target_link_libraries(${whatExeIsBuilding} hsm_security_client)
-endfunction()
-
 if(${use_openssl})
     add_definitions(-DUSE_OPENSSL)
 endif()
 
 set(PROV_DEVICE_CLIENT_SOURCE_C_FILES
-    ./src/prov_device_client.c)
+)
 
 set(PROV_DEVICE_CLIENT_SOURCE_H_FILES
-    ./inc/azure_prov_client/prov_client_const.h
-    ./inc/azure_prov_client/prov_device_client.h)
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_client_const.h
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_device_client.h)
 
 set(PROV_DEVICE_LL_CLIENT_SOURCE_C_FILES
-    ./src/prov_device_ll_client.c)
+    ${CMAKE_CURRENT_LIST_DIR}/src/prov_device_ll_client.c)
 
 set(PROV_DEVICE_LL_CLEINT_SOURCE_H_FILES
-    ./inc/azure_prov_client/prov_client_const.h
-    ./inc/azure_prov_client/prov_device_ll_client.h)
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_client_const.h
+    ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_device_ll_client.h)
 
 set(DEV_AUTH_MODULES_CLIENT_INC_FOLDER "${CMAKE_CURRENT_LIST_DIR}/inc" "${CMAKE_CURRENT_LIST_DIR}/inc/internal" CACHE INTERNAL "this is what needs to be included if using iothub_client lib" FORCE)
 
-include_directories(${DEV_AUTH_MODULES_CLIENT_INC_FOLDER})
-include_directories(${SHARED_UTIL_INC_FOLDER})
-if (NOT ${use_installed_dependencies})
-  include_directories(${CMAKE_CURRENT_LIST_DIR}/../deps/parson)
-endif()
-include_directories(${UHTTP_C_INC_FOLDER})
-include_directories(${IOTHUB_CLIENT_INC_FOLDER})
-include_directories(${CMAKE_CURRENT_LIST_DIR}/adapters)
-
 if(${memory_trace})
     add_definitions(-DGB_MEASURE_MEMORY_FOR_THIS -DGB_DEBUG_ALLOC)
 endif()
@@ -179,47 +135,122 @@ if(WIN32)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 ENDIF(WIN32)
 
-add_library(hsm_security_client ${HSM_CLIENT_C_FILES} ${HSM_CLIENT_H_FILES})
+# Create the HSM security client
+add_library(hsm_security_client
+    ${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_data.c
+    $<$<BOOL:${hsm_type_edge_module}>:${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_http_edge.c>
+    $<$<BOOL:${hsm_type_symm_key}>:${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_key.c>
+    $<$<BOOL:${hsm_type_sastoken}>:${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_tpm.c>
+    $<$<BOOL:${hsm_type_x509}>:${CMAKE_CURRENT_LIST_DIR}/adapters/hsm_client_riot.c>
+)
+
+target_include_directories(hsm_security_client
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/adapters>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+)
+
 setSdkTargetBuildProperties(hsm_security_client)
-linkSharedUtil(hsm_security_client)
-target_link_libraries(hsm_security_client ${HSM_CLIENT_LIBRARY})
+
+# TODO: Remove once uhttp target has the includes
+include_directories(${UHTTP_C_INC_FOLDER})
+
+target_link_libraries(hsm_security_client
+    PUBLIC
+        parson::parson
+        aziotsharedutil
+        $<$<BOOL:${hsm_type_custom}>:${CUSTOM_HSM_LIB}>
+        $<$<BOOL:${hsm_type_edge_module}>:uhttp>
+        $<$<BOOL:${hsm_type_sastoken}>:utpm>
+        $<$<BOOL:${hsm_type_x509}>:msr_riot>
+        $<$<AND:$<BOOL:${run_e2e_tests}>,$<BOOL:${use_prov_client}>>:msr_riot>
+        $<$<AND:$<BOOL:${run_e2e_tests}>,$<BOOL:${use_prov_client}>>:utpm>
+        $<$<AND:$<BOOL:${run_e2e_tests}>,$<BOOL:${use_prov_client}>>:prov_hsm>
+        $<$<BOOL:${WIN32}>:Tbs>
+)
+
 set(provisioning_libs ${provisioning_libs} hsm_security_client)
 set(provisioning_headers ${provisioning_headers} ${HSM_CLIENT_H_FILES})
 
-add_library(prov_auth_client ${AUTH_CLIENT_C_FILES} ${AUTH_CLIENT_H_FILES})
+# Create the provisioning auth client
+add_library(prov_auth_client
+    ${CMAKE_CURRENT_LIST_DIR}/src/prov_auth_client.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/prov_security_factory.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/iothub_auth_client.c
+    ${CMAKE_CURRENT_LIST_DIR}/src/iothub_security_factory.c
+)
+target_include_directories(prov_auth_client
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+)
+target_link_libraries(prov_auth_client
+    PUBLIC
+        aziotsharedutil
+        hsm_security_client
+)
 setSdkTargetBuildProperties(prov_auth_client)
-linkSharedUtil(prov_auth_client)
-target_link_libraries(prov_auth_client hsm_security_client)
 set(provisioning_libs ${provisioning_libs} prov_auth_client)
 set(provisioning_headers ${provisioning_headers} ${AUTH_CLIENT_H_FILES})
 
 if(${use_prov_client} OR (${use_prov_client_core} AND ${run_e2e_tests}))
-    add_library(prov_device_ll_client ${PROV_DEVICE_LL_CLIENT_SOURCE_C_FILES} ${PROV_DEVICE_LL_CLEINT_SOURCE_H_FILES})
+    # Provisioning LL client
+    add_library(prov_device_ll_client
+        ${CMAKE_CURRENT_LIST_DIR}/src/prov_device_ll_client.c
+    )
+    target_include_directories(prov_device_ll_client
+        PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+    )
     setSdkTargetBuildProperties(prov_device_ll_client)
-    linkSharedUtil(prov_device_ll_client)
-    link_security_client(prov_device_ll_client)
     set(provisioning_libs ${provisioning_libs} prov_device_ll_client)
     set(provisioning_headers ${provisioning_headers} ${PROV_DEVICE_LL_CLEINT_SOURCE_H_FILES})
-    target_link_libraries(prov_device_ll_client parson::parson)
 
-    add_library(prov_device_client ${PROV_DEVICE_CLIENT_SOURCE_C_FILES} ${PROV_DEVICE_CLIENT_SOURCE_H_FILES})
+    target_link_libraries(prov_device_ll_client
+        PUBLIC
+            aziotsharedutil
+            prov_auth_client
+            hsm_security_client
+            parson::parson
+    )
+
+    # Convenience provisioning client
+    add_library(prov_device_client 
+        ${CMAKE_CURRENT_LIST_DIR}/src/prov_device_client.c
+    )
+    target_include_directories(prov_device_client
+        PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+    )
+
     setSdkTargetBuildProperties(prov_device_client)
-    target_link_libraries(prov_device_client  prov_device_ll_client)
+    target_link_libraries(prov_device_client
+        PUBLIC
+            prov_device_ll_client
+            parson::parson
+    )
     set(provisioning_libs ${provisioning_libs} prov_device_client)
     set(provisioning_headers ${provisioning_headers} ${PROV_DEVICE_CLIENT_SOURCE_H_FILES})
-    target_link_libraries(prov_device_client parson::parson)
-
 
     if (${build_as_dynamic})
-        add_library(prov_device_client_dll SHARED
-            ${PROV_DEVICE_CLIENT_SOURCE_C_FILES}
-            ${PROV_DEVICE_CLEINT_SOURCE_H_FILES}
-            ${PROV_DEVICE_LL_CLIENT_SOURCE_C_FILES}
-            ${PROV_DEVICE_LL_CLEINT_SOURCE_H_FILES}
-            ./src/prov_device_client_dll.def
+        add_library(prov_device_client_dll
+            SHARED
+                ${CMAKE_CURRENT_LIST_DIR}/src/prov_device_client.c
+                ${CMAKE_CURRENT_LIST_DIR}/src/prov_device_client_dll.def
+        )
+        target_include_directories(prov_device_client_dll
+            PUBLIC
+                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+        )
+
+        target_link_libraries(prov_device_client_dll
+            prov_device_ll_client
+            aziotsharedutil
+            parson::parson
         )
-        linkSharedUtil(prov_device_client_dll)
-        target_link_libraries(prov_device_client_dll prov_device_ll_client parson::parson)
 
         if(NOT WIN32)
             set_target_properties(prov_device_client_dll PROPERTIES OUTPUT_NAME "prov_device_client")
@@ -243,59 +274,85 @@ if(${use_prov_client} OR (${use_prov_client_core} AND ${run_e2e_tests}))
 
     if (${use_http})
         set(PROV_HTTP_CLIENT_H_FILES
-            ./inc/azure_prov_client/prov_transport.h
-            ./inc/azure_prov_client/internal/prov_transport_private.h
-            ./inc/azure_prov_client/prov_transport_http_client.h)
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_private.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport_http_client.h)
         set(PROV_HTTP_CLIENT_C_FILES
-            ./src/prov_transport_http_client.c)
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_http_client.c)
 
         # Provisioning http Transport Client library
         add_library(prov_http_transport ${PROV_HTTP_CLIENT_C_FILES} ${PROV_HTTP_CLIENT_H_FILES})
         setSdkTargetBuildProperties(prov_http_transport)
-        linkSharedUtil(prov_http_transport)
+        target_include_directories(prov_http_transport
+            PUBLIC
+                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+        )
         set(provisioning_libs ${provisioning_libs} prov_http_transport)
         set(provisioning_headers ${provisioning_headers} ${PROV_HTTP_CLIENT_H_FILES})
 
-        target_link_libraries(prov_http_transport uhttp)
+        target_link_libraries(prov_http_transport
+            PUBLIC
+                uhttp
+                aziotsharedutil
+                parson::parson
+        )
     endif()
 
     if (${use_amqp})
         include_directories(${UAMQP_INCLUDES} ${UAMQP_INC_FOLDER})
 
         set(PROV_AMQP_CLIENT_H_FILES
-            ./inc/azure_prov_client/prov_transport.h
-            ./inc/azure_prov_client/prov_transport_amqp_client.h
-            ./inc/azure_prov_client/internal/prov_transport_amqp_common.h
-            ./inc/azure_prov_client/internal/prov_transport_private.h
-            ./inc/azure_prov_client/internal/prov_sasl_tpm.h)
-        set(PROV_AMQP_CLIENT_C_FILES
-            ./src/prov_transport_amqp_client.c
-            ./src/prov_transport_amqp_common.c
-            ./src/prov_sasl_tpm.c)
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport_amqp_client.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_amqp_common.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_private.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_sasl_tpm.h)
 
         set(PROV_AMQP_WS_CLIENT_H_FILES
-            ./inc/azure_prov_client/prov_transport.h
-            ./inc/azure_prov_client/prov_transport_amqp_ws_client.h
-            ./inc/azure_prov_client/internal/prov_transport_amqp_common.h
-            ./inc/azure_prov_client/internal/prov_transport_private.h
-            ./inc/azure_prov_client/internal/prov_sasl_tpm.h)
-        set(PROV_AMQP_WS_CLIENT_C_FILES
-            ./src/prov_transport_amqp_ws_client.c
-            ./src/prov_transport_amqp_common.c
-            ./src/prov_sasl_tpm.c)
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport_amqp_ws_client.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_amqp_common.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_private.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_sasl_tpm.h)
 
-        add_library(prov_amqp_ws_transport ${PROV_AMQP_WS_CLIENT_C_FILES} ${PROV_AMQP_WS_CLIENT_H_FILES})
+        # Provisioning AMQP Websocket transport
+        add_library(prov_amqp_ws_transport
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_amqp_ws_client.c
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_amqp_common.c
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_sasl_tpm.c
+        )
         setSdkTargetBuildProperties(prov_amqp_ws_transport)
-        linkSharedUtil(prov_amqp_ws_transport)
-        target_link_libraries(prov_amqp_ws_transport uamqp)
+        target_link_libraries(prov_amqp_ws_transport
+            PUBLIC
+                uamqp
+                aziotsharedutil
+        )
+        target_include_directories(prov_amqp_ws_transport
+            PUBLIC
+                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+        )
         set(provisioning_libs ${provisioning_libs} prov_amqp_ws_transport)
         set(provisioning_headers ${provisioning_headers} ${PROV_AMQP_WS_CLIENT_H_FILES})
 
-        # Provisioning amqp Transport Client library
-        add_library(prov_amqp_transport ${PROV_AMQP_CLIENT_C_FILES} ${PROV_AMQP_CLIENT_H_FILES})
+        # Provisioning AMQP transport library
+        add_library(prov_amqp_transport
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_amqp_client.c
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_amqp_common.c
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_sasl_tpm.c
+        )
         setSdkTargetBuildProperties(prov_amqp_transport)
-        linkSharedUtil(prov_amqp_transport)
-        target_link_libraries(prov_amqp_transport uamqp)
+        target_link_libraries(prov_amqp_transport
+            PUBLIC
+                uamqp
+                aziotsharedutil
+        )
+        target_include_directories(prov_amqp_transport
+            PUBLIC
+                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+        )
         set(provisioning_libs ${provisioning_libs} prov_amqp_transport)
         set(provisioning_headers ${provisioning_headers} ${PROV_AMQP_CLIENT_H_FILES})
     endif()
@@ -304,35 +361,52 @@ if(${use_prov_client} OR (${use_prov_client_core} AND ${run_e2e_tests}))
         include_directories(${MQTT_INC_FOLDER})
 
         set(PROV_MQTT_CLIENT_H_FILES
-            ./inc/azure_prov_client/prov_transport.h
-            ./inc/azure_prov_client/prov_transport_mqtt_client.h
-            ./inc/azure_prov_client/internal/prov_transport_private.h
-            ./inc/azure_prov_client/internal/prov_transport_mqtt_common.h)
-        set(PROV_MQTT_CLIENT_C_FILES
-            ./src/prov_transport_mqtt_client.c
-            ./src/prov_transport_mqtt_common.c)
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport_mqtt_client.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_private.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_mqtt_common.h)
 
         set(PROV_MQTT_WS_CLIENT_H_FILES
-            ./inc/azure_prov_client/prov_transport.h
-            ./inc/azure_prov_client/prov_transport_mqtt_ws_client.h
-            ./inc/azure_prov_client/internal/prov_transport_private.h
-            ./inc/azure_prov_client/internal/prov_transport_mqtt_common.h)
-        set(PROV_MQTT_WS_CLIENT_C_FILES
-            ./src/prov_transport_mqtt_ws_client.c
-            ./src/prov_transport_mqtt_common.c)
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/prov_transport_mqtt_ws_client.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_private.h
+            ${CMAKE_CURRENT_LIST_DIR}/inc/azure_prov_client/internal/prov_transport_mqtt_common.h)
 
-        add_library(prov_mqtt_ws_transport ${PROV_MQTT_WS_CLIENT_C_FILES} ${PROV_MQTT_WS_CLIENT_H_FILES})
+        # Provisioning MQTT Websocket transport library
+        add_library(prov_mqtt_ws_transport
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_mqtt_ws_client.c
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_mqtt_common.c
+        )
         setSdkTargetBuildProperties(prov_mqtt_ws_transport)
-        linkSharedUtil(prov_mqtt_ws_transport)
-        target_link_libraries(prov_mqtt_ws_transport umqtt)
+        target_link_libraries(prov_mqtt_ws_transport
+            PUBLIC
+                umqtt
+                aziotsharedutil
+        )
+        target_include_directories(prov_mqtt_ws_transport
+            PUBLIC
+                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+        )
         set(provisioning_libs ${provisioning_libs} prov_mqtt_ws_transport)
         set(provisioning_headers ${provisioning_headers} ${PROV_MQTT_WS_CLIENT_H_FILES})
 
-        # Provisioning mqtt Transport Client library
-        add_library(prov_mqtt_transport ${PROV_MQTT_CLIENT_C_FILES} ${PROV_MQTT_CLIENT_H_FILES})
+        # Provisioning MQTT transport library
+        add_library(prov_mqtt_transport 
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_mqtt_client.c
+            ${CMAKE_CURRENT_LIST_DIR}/src/prov_transport_mqtt_common.c
+        )
         setSdkTargetBuildProperties(prov_mqtt_transport)
-        linkSharedUtil(prov_mqtt_transport)
-        target_link_libraries(prov_mqtt_transport umqtt)
+        target_link_libraries(prov_mqtt_transport
+            PUBLIC
+                umqtt
+                aziotsharedutil
+        )
+        target_include_directories(prov_mqtt_transport
+            PUBLIC
+                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
+        )
         set(provisioning_libs ${provisioning_libs} prov_mqtt_transport)
         set(provisioning_headers ${provisioning_headers} ${PROV_MQTT_CLIENT_H_FILES})
     endif()

provisioning_client/samples/iothub_client_sample_hsm/CMakeLists.txt

@@ -40,15 +40,16 @@ if(${use_openssl})
     endif()
 endif()
 
-if (${use_mqtt})
-    target_link_libraries(iothub_client_sample_hsm iothub_client_mqtt_transport)
-endif()
 if (${use_amqp})
-    target_link_libraries(iothub_client_sample_hsm iothub_client_amqp_transport)
     linkUAMQP(iothub_client_sample_hsm)
 endif()
 
-target_link_libraries(iothub_client_sample_hsm iothub_client)
-
-link_security_client(iothub_client_sample_hsm)
-linkSharedUtil(iothub_client_sample_hsm)
+# prov_auth_client must come after the transport selection
+target_link_libraries(iothub_client_sample_hsm
+    $<$<BOOL:${use_mqtt}>:iothub_client_mqtt_transport>
+    $<$<BOOL:${use_amqp}>:iothub_client_amqp_transport>
+    iothub_client
+    prov_auth_client
+    aziotsharedutil
+    hsm_security_client
+)

provisioning_client/samples/prov_dev_client_ll_sample/CMakeLists.txt

@@ -54,7 +54,8 @@ endif()
 
 target_link_libraries(prov_dev_client_ll_sample
     iothub_client
-    prov_device_ll_client)
-
-link_security_client(prov_dev_client_ll_sample)
-linkSharedUtil(prov_dev_client_ll_sample)
+    prov_device_ll_client
+    prov_auth_client
+    aziotsharedutil
+    hsm_security_client
+)

provisioning_client/samples/prov_dev_client_sample/CMakeLists.txt

@@ -32,7 +32,10 @@ add_executable(prov_dev_client_sample ${prov_dev_client_sample_c_files} ${prov_d
 
 target_link_libraries(prov_dev_client_sample
     iothub_client
-    prov_device_client)
+    prov_auth_client
+    hsm_security_client
+    prov_device_client
+)
 
 if(${use_openssl})
     add_definitions(-DUSE_OPENSSL)
@@ -44,15 +47,12 @@ if(${use_openssl})
 endif()
 
 if (${use_http})
-    target_link_libraries(prov_dev_client_sample prov_http_transport)
+    target_link_libraries(prov_dev_client_sample prov_http_transport aziotsharedutil)
 endif()
 if (${use_mqtt})
-    target_link_libraries(prov_dev_client_sample iothub_client_mqtt_transport prov_mqtt_transport prov_mqtt_ws_transport)
+    target_link_libraries(prov_dev_client_sample iothub_client_mqtt_transport prov_mqtt_transport prov_mqtt_ws_transport aziotsharedutil)
 endif()
 if (${use_amqp})
-    target_link_libraries(prov_dev_client_sample iothub_client_amqp_transport prov_amqp_ws_transport prov_amqp_transport)
+    target_link_libraries(prov_dev_client_sample iothub_client_amqp_transport prov_amqp_ws_transport prov_amqp_transport aziotsharedutil)
     linkUAMQP(prov_dev_client_sample)
 endif()
-
-link_security_client(prov_dev_client_sample)
-linkSharedUtil(prov_dev_client_sample)

provisioning_client/tests/hsm_client_http_edge_ut/CMakeLists.txt

@@ -16,4 +16,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        hsm_security_client
+)

provisioning_client/tests/hsm_client_key_ut/CMakeLists.txt

@@ -16,4 +16,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        hsm_security_client
+)

provisioning_client/tests/hsm_client_riot_ut/CMakeLists.txt

@@ -20,7 +20,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        hsm_security_client
+)
 
 #Set RIoT ECDH Curve & RIOTBUILD
 target_compile_definitions(${theseTestsName}_exe

provisioning_client/tests/hsm_client_tpm_ut/CMakeLists.txt

@@ -16,4 +16,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        hsm_security_client
+)

provisioning_client/tests/iothub_auth_client_ut/CMakeLists.txt

@@ -16,4 +16,8 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        hsm_security_client
+        iothub_client
+)

provisioning_client/tests/prov_auth_client_ut/CMakeLists.txt

@@ -16,4 +16,8 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        hsm_security_client
+        prov_device_ll_client
+)

provisioning_client/tests/prov_device_client_ll_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_device_ll_client
+)

provisioning_client/tests/prov_device_client_ut/CMakeLists.txt

@@ -15,4 +15,8 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_device_client
+        parson::parson
+)

provisioning_client/tests/prov_sasl_tpm_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_device_client
+)

provisioning_client/tests/prov_security_factory_ut/CMakeLists.txt

@@ -15,4 +15,8 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_device_client
+        hsm_security_client
+)

provisioning_client/tests/prov_symm_key_client_e2e/CMakeLists.txt

@@ -76,7 +76,9 @@ else()
     endif()
 endif()
 
-target_link_libraries(${theseTestsName}_exe provisioning_service_client)
-
-link_security_client(${theseTestsName}_exe)
-linkSharedUtil(${theseTestsName}_exe)
+target_link_libraries(${theseTestsName}_exe
+    provisioning_service_client
+    prov_auth_client
+    hsm_security_client
+    aziotsharedutil
+)

provisioning_client/tests/prov_tpm_client_e2e/CMakeLists.txt

@@ -75,7 +75,9 @@ else()
     endif()
 endif()
 
-target_link_libraries(${theseTestsName}_exe provisioning_service_client)
-
-link_security_client(${theseTestsName}_exe)
-linkSharedUtil(${theseTestsName}_exe)
+target_link_libraries(${theseTestsName}_exe
+    provisioning_service_client
+    prov_auth_client
+    hsm_security_client
+    aziotsharedutil
+)

provisioning_client/tests/prov_transport_amqp_client_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_amqp_transport
+)

provisioning_client/tests/prov_transport_amqp_common_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_amqp_transport
+)

provisioning_client/tests/prov_transport_amqp_ws_client_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_amqp_ws_transport
+)

provisioning_client/tests/prov_transport_http_client_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_http_transport
+)

provisioning_client/tests/prov_transport_mqtt_client_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_mqtt_transport
+)

provisioning_client/tests/prov_transport_mqtt_common_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_mqtt_transport
+)

provisioning_client/tests/prov_transport_mqtt_ws_client_ut/CMakeLists.txt

@@ -15,4 +15,7 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )
 
-build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests")
+build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
+    ADDITIONAL_LIBS
+        prov_mqtt_ws_transport
+)

provisioning_client/tests/prov_x509_client_e2e/CMakeLists.txt

@@ -75,7 +75,9 @@ else()
     endif()
 endif()
 
-target_link_libraries(${theseTestsName}_exe provisioning_service_client)
-
-link_security_client(${theseTestsName}_exe)
-linkSharedUtil(${theseTestsName}_exe)
+target_link_libraries(${theseTestsName}_exe
+    provisioning_service_client
+    prov_auth_client
+    aziotsharedutil
+    hsm_security_client
+)

provisioning_client/tools/dice_device_enrollment/CMakeLists.txt

@@ -35,6 +35,9 @@ if(${use_openssl})
     endif()
 endif()
 
-linkSharedUtil(dice_device_enrollment)
-link_security_client(dice_device_enrollment)
-target_link_libraries(dice_device_enrollment parson)
+target_link_libraries(dice_device_enrollment
+    prov_auth_client
+    hsm_security_client
+    aziotsharedutil
+    parson
+)

provisioning_client/tools/symm_key_provision/CMakeLists.txt

@@ -27,5 +27,9 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/adapters)
 
 add_executable(symm_key_provision ${symm_key_provision_c_files} ${symm_key_provision_h_files})
 
-linkSharedUtil(symm_key_provision)
-link_security_client(symm_key_provision)
+target_link_libraries(symm_key_provision
+    PUBLIC
+        prov_auth_client
+        hsm_security_client
+        aziotsharedutil
+)

provisioning_client/tools/tpm_device_provision/CMakeLists.txt

@@ -28,6 +28,9 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/adapters)
 
 add_executable(tpm_device_provision ${dev_auth_prov_c_files} ${dev_auth_prov_h_files})
 
-linkSharedUtil(tpm_device_provision)
-link_security_client(tpm_device_provision)
-target_link_libraries(tpm_device_provision parson)
+target_link_libraries(tpm_device_provision
+    prov_auth_client
+    hsm_security_client
+    aziotsharedutil
+    parson
+)