Explicitly link to advapi32 to fix Windows ARM32 linker failure. (Azu…

…re#1669) After Azure@b21239b the Windows ARM32 build would fail to link the libiothsm unit test binaries because the linker could not find `ReportEventA` and `RegisterEventSourceA`. This is probably the same as when the Windows ARM32 support was originally added and we had to link the unit tests to shell32 explicitly, even though the Windows AMD64 build did not complain.
yophilav · Sep 5, 2019 · 651db3b · 651db3b
1 parent 60e6a80
commit 651db3b
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 1 deletion.
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/CMakeLists.txt
@@ -137,7 +137,7 @@ if (save_ut)
 endif(save_ut)
 
 if(WIN32)
-    target_link_libraries(iothsm aziotsharedutil utpm $ENV{OPENSSL_ROOT_DIR}/lib/ssleay32.lib $ENV{OPENSSL_ROOT_DIR}/lib/libeay32.lib)
+    target_link_libraries(iothsm aziotsharedutil utpm $ENV{OPENSSL_ROOT_DIR}/lib/ssleay32.lib $ENV{OPENSSL_ROOT_DIR}/lib/libeay32.lib advapi32)
 else()
     target_link_libraries(iothsm aziotsharedutil utpm ${OPENSSL_LIBRARIES})
 endif(WIN32)

diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/certificate_info_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/certificate_info_ut/CMakeLists.txt
@@ -26,3 +26,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_hsm_crypto_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_hsm_crypto_ut/CMakeLists.txt
@@ -24,3 +24,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_c_shared_utility_tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_hsm_key_intf_sas_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_hsm_key_intf_sas_ut/CMakeLists.txt
@@ -26,3 +26,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_c_shared_utility_tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_hsm_tpm_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_hsm_tpm_ut/CMakeLists.txt
@@ -25,3 +25,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_c_shared_utility_tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_openssl_enc_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_openssl_enc_ut/CMakeLists.txt
@@ -23,3 +23,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_c_shared_utility_tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_openssl_pki_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/edge_openssl_pki_ut/CMakeLists.txt
@@ -26,3 +26,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_c_shared_utility_tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/hsm_client_tpm_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/hsm_client_tpm_ut/CMakeLists.txt
@@ -24,3 +24,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)
diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/tests/hsm_tpm_select_ut/CMakeLists.txt b/edgelet/hsm-sys/azure-iot-hsm-c/tests/hsm_tpm_select_ut/CMakeLists.txt
@@ -25,3 +25,7 @@ set(${theseTestsName}_h_files
 )
 
 build_c_test_artifacts(${theseTestsName} ON "tests")
+
+if(WIN32)
+    target_link_libraries(${theseTestsName}_exe advapi32)
+endif(WIN32)