alexa · alexismailov2 · Dec 23, 2020 · Dec 23, 2020
diff --git a/ACL/src/CMakeLists.txt b/ACL/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB_RECURSE ACL_SRC "${ACL_SOURCE_DIR}/src/*.cpp")
 add_definitions("-DACSDK_LOG_MODULE=acl")
 add_definitions("-DACSDK_OPENSSL_MIN_VER_REQUIRED=${OPENSSL_MIN_VERSION}")
-add_library(ACL SHARED ${ACL_SRC})
+add_library(ACL ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} ${ACL_SRC})
 target_include_directories(ACL PUBLIC "${MultipartParser_SOURCE_DIR}")
 target_include_directories(ACL PUBLIC ${CURL_INCLUDE_DIRS})
 target_include_directories(ACL PUBLIC "${ACL_SOURCE_DIR}/include")

diff --git a/ADSL/src/CMakeLists.txt b/ADSL/src/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 find_package(Threads ${THREADS_PACKAGE_CONFIG})
 add_definitions("-DACSDK_LOG_MODULE=adsl")
-add_library(ADSL SHARED
+add_library(ADSL ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     DirectiveProcessor.cpp
     DirectiveRouter.cpp
     DirectiveSequencer.cpp

diff --git a/AFML/src/CMakeLists.txt b/AFML/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(AFML SHARED
+add_library(AFML ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     AudioActivityTracker.cpp
     Channel.cpp
     FocusManagementComponent.cpp

diff --git a/AVSCommon/CMakeLists.txt b/AVSCommon/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory("AVS")
 add_subdirectory("SDKInterfaces")
 add_subdirectory("Utils")
 
-add_library(AVSCommon SHARED
+add_library(AVSCommon ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     AVS/src/AVSContext.cpp
     AVS/src/AVSDirective.cpp
     AVS/src/AVSMessage.cpp

diff --git a/AVSGatewayManager/src/CMakeLists.txt b/AVSGatewayManager/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=avsGatewayManager")
-add_library(AVSGatewayManager SHARED
+add_library(AVSGatewayManager ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     AVSGatewayManager.cpp
     Storage/AVSGatewayManagerStorage.cpp
     PostConnectVerifyGatewaySender.cpp)

diff --git a/ApplicationUtilities/AndroidUtilities/src/CMakeLists.txt b/ApplicationUtilities/AndroidUtilities/src/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 add_definitions("-DACSDK_LOG_MODULE=androidUtilities")
 
-add_library(AndroidUtilities SHARED
+add_library(AndroidUtilities ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         AndroidLogger.cpp
         AndroidSLESBufferQueue.cpp
         AndroidSLESEngine.cpp

diff --git a/ApplicationUtilities/DefaultClient/src/CMakeLists.txt b/ApplicationUtilities/DefaultClient/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 add_definitions("-DACSDK_LOG_MODULE=defaultClient")
-add_library(DefaultClient SHARED
+add_library(DefaultClient ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     ConnectionRetryTrigger.cpp
     DefaultClient.cpp
     DefaultClientComponent.cpp

diff --git a/ApplicationUtilities/Resources/Audio/src/CMakeLists.txt b/ApplicationUtilities/Resources/Audio/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
-add_library(AudioResources SHARED
+add_library(AudioResources ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         AlertsAudioFactory.cpp
         AudioFactory.cpp
         NotificationsAudioFactory.cpp

diff --git a/ApplicationUtilities/SDKComponent/src/CMakeLists.txt b/ApplicationUtilities/SDKComponent/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=SDKComponent")
 
-add_library(SDKComponent SHARED SDKComponent.cpp)
+add_library(SDKComponent ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SDKComponent.cpp)
 
 target_include_directories(SDKComponent PUBLIC
     "${SDKComponent_SOURCE_DIR}/include")

diff --git a/ApplicationUtilities/SystemSoundPlayer/src/CMakeLists.txt b/ApplicationUtilities/SystemSoundPlayer/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=systemSoundPlayer")
 
-add_library(SystemSoundPlayer SHARED SystemSoundPlayer.cpp)
+add_library(SystemSoundPlayer ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SystemSoundPlayer.cpp)
 
 target_include_directories(SystemSoundPlayer PUBLIC
     "${SystemSoundPlayer_SOURCE_DIR}/include")

diff --git a/BluetoothImplementations/BlueZ/src/CMakeLists.txt b/BluetoothImplementations/BlueZ/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=bluetoothImplementationsBlueZ")
 
-add_library(BluetoothImplementationsBlueZ SHARED
+add_library(BluetoothImplementationsBlueZ ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     BlueZA2DPSink.cpp
     BlueZA2DPSource.cpp
     BlueZAVRCPController.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,12 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
+option(BUILD_STATIC_LIBS "Build static library" OFF)
+if (BUILD_STATIC_LIBS)
+	set(AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE STATIC)
+else()
+	set(AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE SHARED)
+endif()
+
 # Set project information
 project(AlexaClientSDK VERSION 1.22.0 LANGUAGES CXX)
 set(PROJECT_BRIEF "A cross-platform, modular SDK for interacting with the Alexa Voice Service")

diff --git a/CapabilitiesDelegate/src/CMakeLists.txt b/CapabilitiesDelegate/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 add_definitions("-DACSDK_LOG_MODULE=capabilitiesDelegate")
-add_library(CapabilitiesDelegate SHARED
+add_library(CapabilitiesDelegate ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     CapabilitiesDelegate.cpp
     DiscoveryEventSender.cpp
     PostConnectCapabilitiesPublisher.cpp

diff --git a/CapabilityAgents/AIP/src/CMakeLists.txt b/CapabilityAgents/AIP/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 add_definitions("-DACSDK_LOG_MODULE=aip")
-add_library(AIP SHARED
+add_library(AIP ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     AudioInputProcessor.cpp)
 target_include_directories(AIP PUBLIC
     "${AIP_SOURCE_DIR}/include"

diff --git a/CapabilityAgents/Alexa/src/CMakeLists.txt b/CapabilityAgents/Alexa/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_definitions("-DACSDK_LOG_MODULE=alexa")
 
 add_library(
-        Alexa SHARED
+        Alexa ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         AlexaInterfaceCapabilityAgent.cpp
         AlexaInterfaceMessageSender.cpp
 )

diff --git a/CapabilityAgents/ApiGateway/src/CMakeLists.txt b/CapabilityAgents/ApiGateway/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_definitions("-DACSDK_LOG_MODULE=apiGateway")
 
 add_library(
-        ApiGateway SHARED
+        ApiGateway ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         ApiGatewayCapabilityAgent.cpp
 )
 

diff --git a/CapabilityAgents/InteractionModel/src/CMakeLists.txt b/CapabilityAgents/InteractionModel/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=interactionModel")
 
-add_library(InteractionModel SHARED
+add_library(InteractionModel ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         InteractionModelCapabilityAgent.cpp)
 
 target_include_directories(InteractionModel PUBLIC

diff --git a/CapabilityAgents/ModeController/src/CMakeLists.txt b/CapabilityAgents/ModeController/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=modeController")
 
-add_library(ModeController SHARED
+add_library(ModeController ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     ModeControllerAttributeBuilder.cpp
     ModeControllerCapabilityAgent.cpp)
 

diff --git a/CapabilityAgents/PlaybackController/src/CMakeLists.txt b/CapabilityAgents/PlaybackController/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=playbackcontroller")
 
-add_library(PlaybackController SHARED
+add_library(PlaybackController ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     "${CMAKE_CURRENT_LIST_DIR}/PlaybackController.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/PlaybackControllerComponent.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/PlaybackRouter.cpp"

diff --git a/CapabilityAgents/PowerController/src/CMakeLists.txt b/CapabilityAgents/PowerController/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=powerController")
 
-add_library(PowerController SHARED
+add_library(PowerController ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     PowerControllerCapabilityAgent.cpp)
 
 target_include_directories(PowerController

diff --git a/CapabilityAgents/RangeController/src/CMakeLists.txt b/CapabilityAgents/RangeController/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=rangeController")
 
-add_library(RangeController SHARED
+add_library(RangeController ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     RangeControllerAttributeBuilder.cpp
     RangeControllerCapabilityAgent.cpp)
 

diff --git a/CapabilityAgents/SoftwareComponentReporter/src/CMakeLists.txt b/CapabilityAgents/SoftwareComponentReporter/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=SoftwareComponentReporter")
 
-add_library(SoftwareComponentReporter SHARED
+add_library(SoftwareComponentReporter ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     SoftwareComponentReporterCapabilityAgent.cpp)
 
 target_include_directories(SoftwareComponentReporter PUBLIC "${SoftwareComponentReporter_SOURCE_DIR}/include")

diff --git a/CapabilityAgents/SpeakerManager/src/CMakeLists.txt b/CapabilityAgents/SpeakerManager/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=speakerManager")
 
-add_library(SpeakerManager SHARED SpeakerManager.cpp
+add_library(SpeakerManager ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SpeakerManager.cpp
                                   ChannelVolumeManager.cpp
                                   DefaultChannelVolumeFactory.cpp
                                   SpeakerManagerComponent.cpp

diff --git a/CapabilityAgents/SpeechSynthesizer/src/CMakeLists.txt b/CapabilityAgents/SpeechSynthesizer/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=speechSynthesizer")
 
-add_library(SpeechSynthesizer SHARED
+add_library(SpeechSynthesizer ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         SpeechSynthesizer.cpp)
 
 target_include_directories(SpeechSynthesizer PUBLIC

diff --git a/CapabilityAgents/System/src/CMakeLists.txt b/CapabilityAgents/System/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=system")
 
-add_library(AVSSystem SHARED
+add_library(AVSSystem ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     "${CMAKE_CURRENT_LIST_DIR}/LocaleHandler.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/ReportStateHandler.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/SoftwareInfoSender.cpp"

diff --git a/CapabilityAgents/TemplateRuntime/src/CMakeLists.txt b/CapabilityAgents/TemplateRuntime/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=templateRuntime")
 
-add_library(TemplateRuntime SHARED
+add_library(TemplateRuntime ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     "${CMAKE_CURRENT_LIST_DIR}/TemplateRuntime.cpp"
     "${CMAKE_CURRENT_LIST_DIR}/RenderPlayerInfoCardsProviderRegistrar.cpp")
 

diff --git a/CapabilityAgents/ToggleController/src/CMakeLists.txt b/CapabilityAgents/ToggleController/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=toggleController")
 
-add_library(ToggleController SHARED
+add_library(ToggleController ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     ToggleControllerAttributeBuilder.cpp
     ToggleControllerCapabilityAgent.cpp)
 

diff --git a/Captions/Component/src/CMakeLists.txt b/Captions/Component/src/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CaptionsComponent_SOURCES)
 list(APPEND CaptionsComponent_SOURCES
         CaptionsComponent.cpp)
 
-add_library(CaptionsComponent SHARED ${CaptionsComponent_SOURCES})
+add_library(CaptionsComponent ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} ${CaptionsComponent_SOURCES})
 
 target_include_directories(CaptionsComponent PUBLIC
         "${Captions_SOURCE_DIR}/Component/include")

diff --git a/Captions/Implementation/src/CMakeLists.txt b/Captions/Implementation/src/CMakeLists.txt
@@ -11,7 +11,7 @@ if (CAPTIONS)
     list(APPEND CaptionsLib_SOURCES LibwebvttParserAdapter.cpp)
 endif()
 
-add_library(CaptionsLib SHARED ${CaptionsLib_SOURCES})
+add_library(CaptionsLib ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} ${CaptionsLib_SOURCES})
 
 target_include_directories(CaptionsLib PUBLIC
         "${Captions_SOURCE_DIR}/Implementation/include")

diff --git a/Captions/Interface/src/CMakeLists.txt b/Captions/Interface/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=captions")
-add_library(Captions SHARED
+add_library(Captions ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         CaptionData.cpp
         CaptionLine.cpp
         CaptionFrame.cpp

diff --git a/CertifiedSender/src/CMakeLists.txt b/CertifiedSender/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=certifiedSender")
-add_library(CertifiedSender SHARED
+add_library(CertifiedSender ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         CertifiedSender.cpp
         SQLiteMessageStorage.cpp)
 

diff --git a/ContextManager/src/CMakeLists.txt b/ContextManager/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=contextManager")
-add_library(ContextManager SHARED
+add_library(ContextManager ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     ContextManager.cpp)
 
 target_include_directories(ContextManager PUBLIC

diff --git a/Diagnostics/src/CMakeLists.txt b/Diagnostics/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=diagnostics")
 
-add_library(Diagnostics SHARED
+add_library(Diagnostics ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         DevicePropertyAggregator.cpp
         DiagnosticsUtils.cpp
         DeviceProtocolTracer.cpp

diff --git a/Endpoints/src/CMakeLists.txt b/Endpoints/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=endpoints")
 
-add_library(Endpoints SHARED
+add_library(Endpoints ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         Endpoint.cpp
         EndpointAttributeValidation.cpp
         EndpointBuilder.cpp

diff --git a/InterruptModel/src/CMakeLists.txt b/InterruptModel/src/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 add_definitions("-DACSDK_LOG_MODULE=interruptModel")
 
-add_library(InterruptModel SHARED
+add_library(InterruptModel ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         InterruptModel.cpp
         "${InterruptModel_SOURCE_DIR}/config/src/InterruptModelConfiguration.cpp")
 

diff --git a/KWD/KWDProvider/src/CMakeLists.txt b/KWD/KWDProvider/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(KeywordDetectorProvider SHARED
+add_library(KeywordDetectorProvider ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     KeywordDetectorProvider.cpp)
 
 target_include_directories(KeywordDetectorProvider PUBLIC

diff --git a/KWD/KittAi/src/CMakeLists.txt b/KWD/KittAi/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=kittAiKeyWordDetector")
-add_library(KITTAI SHARED
+add_library(KITTAI ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     SnowboyWrapper.cpp
     KittAiKeyWordDetector.cpp)
 

diff --git a/KWD/Sensory/src/CMakeLists.txt b/KWD/Sensory/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=sensoryKeywordDetector")
-add_library(SENSORY SHARED
+add_library(SENSORY ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     SensoryKeywordDetector.cpp)
 
 target_include_directories(SENSORY PUBLIC

diff --git a/KWD/src/CMakeLists.txt b/KWD/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=abstractKeywordDetector")
-add_library(KWD SHARED
+add_library(KWD ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     AbstractKeywordDetector.cpp)
 
 include_directories(KWD "${KWD_SOURCE_DIR}/include")

diff --git a/MediaPlayer/AndroidSLESMediaPlayer/src/CMakeLists.txt b/MediaPlayer/AndroidSLESMediaPlayer/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=androidSLESMediaPlayer")
-add_library(AndroidSLESMediaPlayer SHARED
+add_library(AndroidSLESMediaPlayer ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
         AndroidSLESMediaQueue.cpp
         AndroidSLESMediaPlayer.cpp
         AndroidSLESSpeaker.cpp

diff --git a/MediaPlayer/GStreamerMediaPlayer/src/CMakeLists.txt b/MediaPlayer/GStreamerMediaPlayer/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DACSDK_LOG_MODULE=mediaPlayer")
-add_library(MediaPlayer SHARED
+add_library(MediaPlayer ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     AttachmentReaderSource.cpp
     BaseStreamSource.cpp
     ErrorTypeConversion.cpp

diff --git a/Metrics/MetricRecorder/src/CMakeLists.txt b/Metrics/MetricRecorder/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(MetricRecorder SHARED MetricRecorder.cpp)
+add_library(MetricRecorder ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} MetricRecorder.cpp)
 
 target_include_directories(MetricRecorder	PUBLIC
 	"${MetricRecorder_SOURCE_DIR}/include"

diff --git a/Metrics/SampleMetricSink/src/CMakeLists.txt b/Metrics/SampleMetricSink/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(SampleMetricSink SHARED SampleMetricSink.cpp)
+add_library(SampleMetricSink ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SampleMetricSink.cpp)
 
 target_include_directories(SampleMetricSink	PUBLIC
 	"${SampleMetricSink_SOURCE_DIR}/include"

diff --git a/Metrics/UplCalculator/src/CMakeLists.txt b/Metrics/UplCalculator/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_library(UplCalculator SHARED
+add_library(UplCalculator ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
 	BaseUplCalculator.cpp
 	MediaUplCalculator.cpp
 	TtsUplCalculator.cpp

diff --git a/PlaylistParser/src/CMakeLists.txt b/PlaylistParser/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=PlaylistParser")
 
-add_library(PlaylistParser SHARED
+add_library(PlaylistParser ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     ContentDecrypter.cpp
     FFMpegInputBuffer.cpp
     Id3TagsRemover.cpp

diff --git a/RegistrationManager/src/CMakeLists.txt b/RegistrationManager/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions("-DACSDK_LOG_MODULE=registrationManager")
 
-add_library(RegistrationManager SHARED RegistrationManager.cpp CustomerDataManager.cpp CustomerDataHandler.cpp)
+add_library(RegistrationManager ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} RegistrationManager.cpp CustomerDataManager.cpp CustomerDataHandler.cpp)
 
 target_include_directories(RegistrationManager PUBLIC
     "${RegistrationManager_SOURCE_DIR}/include")

diff --git a/SampleApp/Authorization/CBLAuthDelegate/src/CMakeLists.txt b/SampleApp/Authorization/CBLAuthDelegate/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 find_package(Threads ${THREADS_PACKAGE_CONFIG})
 
 add_definitions("-DACSDK_LOG_MODULE=cblAuthDelegate")
-add_library(CBLAuthDelegate SHARED
+add_library(CBLAuthDelegate ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE}
     CBLAuthDelegate.cpp
     CBLAuthDelegateConfiguration.cpp
     SQLiteCBLAuthDelegateStorage.cpp)