Update the build config and template for multiple platforms

Signed-off-by: Junbo Liang <[email protected]>

package-system/AwsIotDeviceSdkCpp/FindAwsIotDeviceSdkCpp.cmake.template

@@ -16,21 +16,33 @@ endif()
 set(AWSIOTDEVICESDKCPP_INCLUDE_DIR $${CMAKE_CURRENT_LIST_DIR}/AwsIotDeviceSdkCpp/include)
 set(AWSIOTDEVICESDKCPP_LIBS_DIR $${CMAKE_CURRENT_LIST_DIR}/AwsIotDeviceSdkCpp/lib/$$<IF:$$<CONFIG:Debug>,Debug,Release>)
 
+if ($${PAL_PLATFORM_NAME} STREQUAL "Windows")
+    set(AWSIOTDEVICESDKCPP_ADDITIONAL_LIBS
+        Ncrypt
+        Secur32
+        Shlwapi
+    )
+elseif ($${PAL_PLATFORM_NAME} STREQUAL "Linux")
+    set (AWSIOTDEVICESDKCPP_ADDITIONAL_LIBS
+        "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-sdkutils$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    )
+else ()
+    set (AWSIOTDEVICESDKCPP_ADDITIONAL_LIBS
+    )
+endif()
+
 set(AWSIOTDEVICESDKCPP_LIBS
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-crt-cpp$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-mqtt$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-auth$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-http$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-compression$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-cal$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-io$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-event-stream$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-checksums$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-common$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    #"$${AWSIOTDEVICESDKCPP_LIBS_DIR}/aws-c-iot$${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    Ncrypt
-    Secur32
-    Shlwapi
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-crt-cpp$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-mqtt$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-auth$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-http$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-compression$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-cal$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-io$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-event-stream$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-checksums$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "$${AWSIOTDEVICESDKCPP_LIBS_DIR}/$${CMAKE_STATIC_LIBRARY_PREFIX}aws-c-common$${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    $${AWSIOTDEVICESDKCPP_ADDITIONAL_LIBS}
 )
 
 add_library($${TARGET_WITH_NAMESPACE} INTERFACE IMPORTED GLOBAL)

package-system/AwsIotDeviceSdkCpp/build_config.json

@@ -89,7 +89,8 @@
                "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12",
                "-DCMAKE_OSX_ARCHITECTURES=x86_64",
                "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\"",
-               "-DCMAKE_CXX_STANDARD=17"
+               "-DCMAKE_CXX_STANDARD=17",
+               "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\""
             ],
             "cmake_build_args":[
                "-j",
@@ -135,20 +136,22 @@
             "cmake_generate_args_debug":[
                "-G",
                "Unix\\ Makefiles",
-               "-DCMAKE_C_COMPILER=clang-6.0",
-               "-DCMAKE_CXX_COMPILER=clang++-6.0",
+               "-DCMAKE_C_COMPILER=clang-12",
+               "-DCMAKE_CXX_COMPILER=clang++-12",
                "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\"",
                "-DCMAKE_CXX_STANDARD=17",
-               "-DCMAKE_BUILD_TYPE=Debug"
+               "-DCMAKE_BUILD_TYPE=Debug",
+               "-DCMAKE_INSTALL_LIBDIR=\"lib/Debug\""
             ],
             "cmake_generate_args_release":[
                "-G",
                "Unix\\ Makefiles",
-               "-DCMAKE_C_COMPILER=clang-6.0",
-               "-DCMAKE_CXX_COMPILER=clang++-6.0",
+               "-DCMAKE_C_COMPILER=clang-12",
+               "-DCMAKE_CXX_COMPILER=clang++-12",
                "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\"",
                "-DCMAKE_CXX_STANDARD=17",
-               "-DCMAKE_BUILD_TYPE=Release"
+               "-DCMAKE_BUILD_TYPE=Release",
+               "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\""
             ],
             "cmake_build_args":[
                "-j"