Fix all samples

aws · Dec 2, 2024 · 18eacfd · 18eacfd
1 parent 46b10ef
commit 18eacfd
Show file tree

Hide file tree

Showing 24 changed files with 116 additions and 300 deletions.
diff --git a/samples/device_defender/basic_report/CMakeLists.txt b/samples/device_defender/basic_report/CMakeLists.txt
@@ -24,22 +24,14 @@ if (UNIX AND NOT APPLE)
     find_package(IotDeviceCommon-cpp REQUIRED)
     find_package(IotDeviceDefender-cpp REQUIRED)
 
-    if (UNIX AND NOT APPLE)
+    if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
         include(GNUInstallDirs)
-    elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-        set(CMAKE_INSTALL_LIBDIR "lib")
-
-        if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-            set(FIND_LIBRARY_USE_LIB64_PATHS true)
-        endif()
+        list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+        include(AwsSanitizers)
+        enable_language(C)
+        aws_add_sanitizers(${PROJECT_NAME})
     endif()
 
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-    include(AwsSanitizers)
-    enable_language(C)
-    aws_add_sanitizers(${PROJECT_NAME})
-
     target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotDeviceCommon-cpp AWS::IotDeviceDefender-cpp)
 
 endif()
diff --git a/samples/device_defender/mqtt5_basic_report/CMakeLists.txt b/samples/device_defender/mqtt5_basic_report/CMakeLists.txt
@@ -24,22 +24,14 @@ if (UNIX AND NOT APPLE)
     find_package(IotDeviceCommon-cpp REQUIRED)
     find_package(IotDeviceDefender-cpp REQUIRED)
 
-    if (UNIX AND NOT APPLE)
+    if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
         include(GNUInstallDirs)
-    elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-        set(CMAKE_INSTALL_LIBDIR "lib")
-
-        if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-            set(FIND_LIBRARY_USE_LIB64_PATHS true)
-        endif()
+        list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+        include(AwsSanitizers)
+        enable_language(C)
+        aws_add_sanitizers(${PROJECT_NAME})
     endif()
 
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-    include(AwsSanitizers)
-    enable_language(C)
-    aws_add_sanitizers(${PROJECT_NAME})
-
     target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotDeviceCommon-cpp AWS::IotDeviceDefender-cpp)
 
 endif()
diff --git a/samples/fleet_provisioning/fleet_provisioning/CMakeLists.txt b/samples/fleet_provisioning/fleet_provisioning/CMakeLists.txt
@@ -25,20 +25,12 @@ find_package(IotIdentity-cpp REQUIRED)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotIdentity-cpp)
diff --git a/samples/fleet_provisioning/mqtt5_fleet_provisioning/CMakeLists.txt b/samples/fleet_provisioning/mqtt5_fleet_provisioning/CMakeLists.txt
@@ -25,20 +25,12 @@ find_package(IotIdentity-cpp REQUIRED)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotIdentity-cpp)
diff --git a/samples/greengrass/basic_discovery/CMakeLists.txt b/samples/greengrass/basic_discovery/CMakeLists.txt
@@ -25,20 +25,12 @@ find_package(Discovery-cpp REQUIRED)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::Discovery-cpp)
diff --git a/samples/greengrass/ipc/CMakeLists.txt b/samples/greengrass/ipc/CMakeLists.txt
@@ -25,20 +25,12 @@ find_package(GreengrassIpc-cpp REQUIRED)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::EventstreamRpc-cpp AWS::GreengrassIpc-cpp)
diff --git a/samples/jobs/job_execution/CMakeLists.txt b/samples/jobs/job_execution/CMakeLists.txt
@@ -25,20 +25,12 @@ find_package(IotJobs-cpp REQUIRED)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotJobs-cpp)
diff --git a/samples/jobs/mqtt5_job_execution/CMakeLists.txt b/samples/jobs/mqtt5_job_execution/CMakeLists.txt
@@ -25,7 +25,7 @@ find_package(IotJobs-cpp REQUIRED)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
     include(AwsSanitizers)

diff --git a/samples/mqtt/basic_connect/CMakeLists.txt b/samples/mqtt/basic_connect/CMakeLists.txt
@@ -22,20 +22,12 @@ endif ()
 
 find_package(aws-crt-cpp REQUIRED)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp)
diff --git a/samples/mqtt/cognito_connect/CMakeLists.txt b/samples/mqtt/cognito_connect/CMakeLists.txt
@@ -22,20 +22,12 @@ endif ()
 
 find_package(aws-crt-cpp REQUIRED)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp)
diff --git a/samples/mqtt/custom_authorizer_connect/CMakeLists.txt b/samples/mqtt/custom_authorizer_connect/CMakeLists.txt
@@ -22,20 +22,12 @@ endif ()
 
 find_package(aws-crt-cpp REQUIRED)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp)
diff --git a/samples/mqtt/pkcs11_connect/CMakeLists.txt b/samples/mqtt/pkcs11_connect/CMakeLists.txt
@@ -32,20 +32,12 @@ endif()
 
 find_package(aws-crt-cpp REQUIRED)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp)
diff --git a/samples/mqtt/pkcs12_connect/CMakeLists.txt b/samples/mqtt/pkcs12_connect/CMakeLists.txt
@@ -22,20 +22,12 @@ endif ()
 
 find_package(aws-crt-cpp REQUIRED)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp)
diff --git a/samples/mqtt/websocket_connect/CMakeLists.txt b/samples/mqtt/websocket_connect/CMakeLists.txt
@@ -22,20 +22,12 @@ endif ()
 
 find_package(aws-crt-cpp REQUIRED)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp)
diff --git a/samples/mqtt/windows_cert_connect/CMakeLists.txt b/samples/mqtt/windows_cert_connect/CMakeLists.txt
@@ -22,20 +22,12 @@ endif ()
 
 find_package(aws-crt-cpp REQUIRED)
 
-if (UNIX AND NOT APPLE)
+if (ENABLE_SANITIZERS AND UNIX AND NOT APPLE)
     include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+    include(AwsSanitizers)
+    enable_language(C)
+    aws_add_sanitizers(${PROJECT_NAME})
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
-include(AwsSanitizers)
-enable_language(C)
-aws_add_sanitizers(${PROJECT_NAME})
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp)