From 300ab51a9489da2c882e2c3bdcda57eb4e75f139 Mon Sep 17 00:00:00 2001
From: HaseenaSainul <h.sainul@metrological.com>
Date: Fri, 9 Feb 2024 07:47:38 -0500
Subject: [PATCH] Updates based on MAC testing

---
 languages/cpp/src/shared/src/CMakeLists.txt   |  5 +++++
 .../cpp/templates/sdk/scripts/install.sh      | 22 +++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/languages/cpp/src/shared/src/CMakeLists.txt b/languages/cpp/src/shared/src/CMakeLists.txt
index 960af8de..bff98101 100644
--- a/languages/cpp/src/shared/src/CMakeLists.txt
+++ b/languages/cpp/src/shared/src/CMakeLists.txt
@@ -31,11 +31,16 @@ add_library(${TARGET} ${FIREBOLT_LIBRARY_TYPE}
 )
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+find_package(${NAMESPACE}WebSocket CONFIG REQUIRED)
 find_package(${NAMESPACE}WebSocket CONFIG REQUIRED)
+find_package(${NAMESPACE}Core CONFIG REQUIRED)
 
 target_link_libraries(${TARGET}
     PUBLIC
         ${NAMESPACE}WebSocket::${NAMESPACE}WebSocket
+        ${NAMESPACE}Core::${NAMESPACE}Core
+        ${NAMESPACE}WebSocket::${NAMESPACE}WebSocket
 )
 
 target_include_directories(${TARGET}
diff --git a/languages/cpp/templates/sdk/scripts/install.sh b/languages/cpp/templates/sdk/scripts/install.sh
index 2e8a956c..b1aa8892 100755
--- a/languages/cpp/templates/sdk/scripts/install.sh
+++ b/languages/cpp/templates/sdk/scripts/install.sh
@@ -40,18 +40,18 @@ ReleasePath=${InstallPath}/${ReleaseName}
 
 rm -rf ${ReleasePath}
 mkdir -p ${ReleasePath}
-cp -ar ${SdkPath}/src ${ReleasePath}
-cp -ar ${SdkPath}/include ${ReleasePath}
-cp -ar ${SdkPath}/cmake ${ReleasePath}
-cp -ar ${SdkPath}/scripts/build.sh ${ReleasePath}
-cp -ar ${SdkPath}/CMakeLists.txt ${ReleasePath}
-cp -ar ${SdkPath}/cpptest ${ReleasePath}/test
+cp -aR ${SdkPath}/src ${ReleasePath}
+cp -aR ${SdkPath}/include ${ReleasePath}
+cp -aR ${SdkPath}/cmake ${ReleasePath}
+cp -aR ${SdkPath}/scripts/build.sh ${ReleasePath}
+cp -aR ${SdkPath}/CMakeLists.txt ${ReleasePath}
+cp -aR ${SdkPath}/cpptest ${ReleasePath}/test
 
-sed -i '/EnableTest="ON";;/d' ${ReleasePath}/build.sh
-sed -i 's/getopts p:s:tch/getopts p:s:ch/g' ${ReleasePath}/build.sh
-sed -i '/enable test/d' ${ReleasePath}/build.sh
-sed -i '/EnableTest="OFF"/d' ${ReleasePath}/build.sh
-sed -i 's/ -DENABLE_TESTS=${EnableTest}//g' ${ReleasePath}/build.sh
+sed -i'' -e '/EnableTest="ON";;/d' ${ReleasePath}/build.sh
+sed -i'' -e 's/getopts p:s:tch/getopts p:s:ch/g' ${ReleasePath}/build.sh
+sed -i'' -e '/enable test/d' ${ReleasePath}/build.sh
+sed -i'' -e '/EnableTest="OFF"/d' ${ReleasePath}/build.sh
+sed -i'' -e 's/ -DENABLE_TESTS=${EnableTest}//g' ${ReleasePath}/build.sh
 
 cd ${ReleasePath}/../
 tar -cvzf ${ReleaseName}.tgz ${ReleaseName}/*