From 25f174ae9ddedc71dabfe497bc3f33d4823ec238 Mon Sep 17 00:00:00 2001 From: Alexander Ismailov Date: Thu, 24 Dec 2020 00:50:21 +0200 Subject: [PATCH 1/2] Added ability to build libraries as static(there is some problems with linking now). Signed-off-by: Alexander Ismailov --- ACL/src/CMakeLists.txt | 2 +- ADSL/src/CMakeLists.txt | 2 +- AFML/src/CMakeLists.txt | 2 +- AVSCommon/CMakeLists.txt | 2 +- AVSGatewayManager/src/CMakeLists.txt | 2 +- ApplicationUtilities/AndroidUtilities/src/CMakeLists.txt | 2 +- ApplicationUtilities/DefaultClient/src/CMakeLists.txt | 2 +- ApplicationUtilities/Resources/Audio/src/CMakeLists.txt | 2 +- ApplicationUtilities/SDKComponent/src/CMakeLists.txt | 2 +- ApplicationUtilities/SystemSoundPlayer/src/CMakeLists.txt | 2 +- BluetoothImplementations/BlueZ/src/CMakeLists.txt | 2 +- CMakeLists.txt | 7 +++++++ CapabilitiesDelegate/src/CMakeLists.txt | 2 +- CapabilityAgents/AIP/src/CMakeLists.txt | 2 +- CapabilityAgents/Alexa/src/CMakeLists.txt | 2 +- CapabilityAgents/ApiGateway/src/CMakeLists.txt | 2 +- CapabilityAgents/InteractionModel/src/CMakeLists.txt | 2 +- CapabilityAgents/ModeController/src/CMakeLists.txt | 2 +- CapabilityAgents/PlaybackController/src/CMakeLists.txt | 2 +- CapabilityAgents/PowerController/src/CMakeLists.txt | 2 +- CapabilityAgents/RangeController/src/CMakeLists.txt | 2 +- .../SoftwareComponentReporter/src/CMakeLists.txt | 2 +- CapabilityAgents/SpeakerManager/src/CMakeLists.txt | 2 +- CapabilityAgents/SpeechSynthesizer/src/CMakeLists.txt | 2 +- CapabilityAgents/System/src/CMakeLists.txt | 2 +- CapabilityAgents/TemplateRuntime/src/CMakeLists.txt | 2 +- CapabilityAgents/ToggleController/src/CMakeLists.txt | 2 +- Captions/Component/src/CMakeLists.txt | 2 +- Captions/Implementation/src/CMakeLists.txt | 2 +- Captions/Interface/src/CMakeLists.txt | 2 +- CertifiedSender/src/CMakeLists.txt | 2 +- ContextManager/src/CMakeLists.txt | 2 +- Diagnostics/src/CMakeLists.txt | 2 +- Endpoints/src/CMakeLists.txt | 2 +- InterruptModel/src/CMakeLists.txt | 2 +- KWD/KWDProvider/src/CMakeLists.txt | 2 +- KWD/KittAi/src/CMakeLists.txt | 2 +- KWD/Sensory/src/CMakeLists.txt | 2 +- KWD/src/CMakeLists.txt | 2 +- MediaPlayer/AndroidSLESMediaPlayer/src/CMakeLists.txt | 2 +- MediaPlayer/GStreamerMediaPlayer/src/CMakeLists.txt | 2 +- Metrics/MetricRecorder/src/CMakeLists.txt | 2 +- Metrics/SampleMetricSink/src/CMakeLists.txt | 2 +- Metrics/UplCalculator/src/CMakeLists.txt | 2 +- PlaylistParser/src/CMakeLists.txt | 2 +- RegistrationManager/src/CMakeLists.txt | 2 +- SampleApp/Authorization/CBLAuthDelegate/src/CMakeLists.txt | 2 +- SampleApp/src/CMakeLists.txt | 2 +- Settings/src/CMakeLists.txt | 2 +- SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt | 2 +- SpeechEncoder/src/CMakeLists.txt | 2 +- Storage/SQLiteStorage/src/CMakeLists.txt | 2 +- SynchronizeStateSender/src/CMakeLists.txt | 2 +- .../src/CMakeLists.txt | 2 +- .../acsdkCBLAuthorizationDelegate/src/CMakeLists.txt | 2 +- .../src/CMakeLists.txt | 2 +- .../acsdkDefaultDeviceSettingsManager/src/CMakeLists.txt | 2 +- .../src/CMakeLists.txt | 2 +- .../src/CMakeLists.txt | 2 +- .../src/CMakeLists.txt | 2 +- .../acsdkLibcurlAlexaCommunications/src/CMakeLists.txt | 2 +- .../acsdkLibcurlHTTPContentFetcher/src/CMakeLists.txt | 2 +- applications/acsdkNullMetricRecorder/src/CMakeLists.txt | 2 +- applications/acsdkNullSystemTimeZone/src/CMakeLists.txt | 2 +- applications/acsdkPreviewAlexaClient/src/CMakeLists.txt | 2 +- .../src/CMakeLists.txt | 2 +- capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt | 2 +- .../AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt | 2 +- capabilities/Bluetooth/acsdkBluetooth/src/CMakeLists.txt | 2 +- .../DoNotDisturb/acsdkDoNotDisturb/src/CMakeLists.txt | 2 +- capabilities/Equalizer/acsdkEqualizer/src/CMakeLists.txt | 2 +- .../acsdkEqualizerImplementations/src/CMakeLists.txt | 2 +- .../acsdkExternalMediaPlayer/src/CMakeLists.txt | 2 +- .../acsdkExternalMediaPlayerInterfaces/src/CMakeLists.txt | 2 +- .../MultiRoomMusic/acsdkMultiRoomMusic/src/CMakeLists.txt | 2 +- .../Notifications/acsdkNotifications/src/CMakeLists.txt | 2 +- core/acsdkCore/src/CMakeLists.txt | 2 +- .../src/CMakeLists.txt | 2 +- shared/acsdkManufactory/src/CMakeLists.txt | 2 +- shared/acsdkShared/src/CMakeLists.txt | 2 +- shared/acsdkShutdownManager/src/CMakeLists.txt | 2 +- shared/acsdkStartupManager/src/CMakeLists.txt | 2 +- 82 files changed, 88 insertions(+), 81 deletions(-) diff --git a/ACL/src/CMakeLists.txt b/ACL/src/CMakeLists.txt index ee1bbc040f..355fcbeebd 100644 --- 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 index 0d4ee505d5..97392b8358 100644 --- 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 index 916797dbe0..ed9051371a 100644 --- 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 index e69d7bce79..58068b1f1b 100644 --- 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 index 9a4ca9d640..7f40819395 100644 --- 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 index 9b6b70e57a..b7cfb3025e 100644 --- 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 index e31b7880a8..f9d6d551dd 100644 --- 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 index 1486df6ed7..0e9ca9c566 100644 --- 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 index d5468ea62a..9bcdff94ec 100644 --- 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 index c46cd4fa4d..1f5b7e7f02 100644 --- 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 index 154c17d446..ad9bf04523 100644 --- 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 index dde4782046..040edd80bf 100644 --- 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 index ae94980113..5da0dfb4f5 100644 --- 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 index dc3abfa2e8..c5d688baef 100644 --- 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 index 328d3ce522..3edf0e50b3 100644 --- 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 index 8bb605ca39..3396d846fe 100644 --- 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 index fc188afe6f..dd143b47c1 100644 --- 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 index 520bef3292..a44eae95e5 100644 --- 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 index 389db8f158..a65767870f 100644 --- 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 index 23f387506d..a59c2ec133 100644 --- 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 index b51b147372..a7605c5556 100644 --- 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 index aa196d7c20..5385551132 100644 --- 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 index 3d298b4f69..6f45caca30 100644 --- 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 index c37acf17ea..cd23dd9ea0 100644 --- 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 index 2574fd8c19..59a1afacab 100644 --- 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 index 8d35cd7483..7c64f7763e 100644 --- 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 index 0d34afd6de..0f61d03449 100644 --- 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 index 1b70b95b36..959df52bf8 100644 --- 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 index 6f0c4800b1..261a10c11f 100644 --- 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 index 07ed007d46..d93d0908fc 100644 --- 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 index 6a4c206a1c..13bd32c56d 100644 --- 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 index ad9c7b9280..c069c7892a 100644 --- 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 index f16fb2521f..3b6ed41a81 100644 --- 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 index 98dfbeaaa1..c62a46393f 100644 --- 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 index f383b8d389..a9a66edae1 100644 --- 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 index 207abe798a..95e8240065 100644 --- 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 index 1cc36e3cf2..573ae6f62c 100644 --- 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 index d31f273a7d..6175917dca 100644 --- 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 index ff42adfb4f..5f17ac43ce 100644 --- 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 index adf6099dba..ee67b62935 100644 --- 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 index c8b92d587f..5cdef6c299 100644 --- 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 index 3e00a3c269..fb4383b046 100644 --- 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 index 08fe042321..721e358502 100644 --- 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 index 01ae3c72ce..31642d16a5 100644 --- 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 index 7826817892..3e41b5c3f2 100644 --- 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 index ca9c527eb4..dd30a49a24 100644 --- 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 index 6bd4dd0351..802937fea4 100644 --- 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) diff --git a/SampleApp/src/CMakeLists.txt b/SampleApp/src/CMakeLists.txt index 6edd863c5a..d2c1479431 100644 --- a/SampleApp/src/CMakeLists.txt +++ b/SampleApp/src/CMakeLists.txt @@ -59,7 +59,7 @@ if(EXTERNAL_MEDIA_ADAPTERS) list(APPEND LibSampleApp_SOURCES ${ALL_EMP_ADAPTER_REGISTRATION_FILES}) endif () -add_library(LibSampleApp SHARED ${LibSampleApp_SOURCES}) +add_library(LibSampleApp ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} ${LibSampleApp_SOURCES}) target_include_directories(LibSampleApp PUBLIC # This is relative to project(SampleApp). diff --git a/Settings/src/CMakeLists.txt b/Settings/src/CMakeLists.txt index 4ddae40d8f..19750c4979 100644 --- a/Settings/src/CMakeLists.txt +++ b/Settings/src/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions("-DACSDK_LOG_MODULE=settings") -add_library(DeviceSettings SHARED +add_library(DeviceSettings ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} CloudControlledSettingProtocol.cpp DeviceControlledSettingProtocol.cpp SettingEventSender.cpp diff --git a/SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt b/SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt index 00b3985053..dc2b31b864 100644 --- a/SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt +++ b/SpeechEncoder/OpusEncoderContext/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=opusEncoderContext") -add_library(OpusEncoderContext SHARED +add_library(OpusEncoderContext ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} OpusEncoderContext.cpp) find_path(OPUS_INCLUDE_DIR opus) diff --git a/SpeechEncoder/src/CMakeLists.txt b/SpeechEncoder/src/CMakeLists.txt index b331d03895..68b613ac2a 100644 --- a/SpeechEncoder/src/CMakeLists.txt +++ b/SpeechEncoder/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=speechEncoder") -add_library(SpeechEncoder SHARED +add_library(SpeechEncoder ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SpeechEncoder.cpp ) diff --git a/Storage/SQLiteStorage/src/CMakeLists.txt b/Storage/SQLiteStorage/src/CMakeLists.txt index 012363ee29..f89102ffc5 100644 --- a/Storage/SQLiteStorage/src/CMakeLists.txt +++ b/Storage/SQLiteStorage/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=sqliteStorage") -add_library(SQLiteStorage SHARED +add_library(SQLiteStorage ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SQLiteDatabase.cpp SQLiteMiscStorage.cpp SQLiteStatement.cpp diff --git a/SynchronizeStateSender/src/CMakeLists.txt b/SynchronizeStateSender/src/CMakeLists.txt index 2c3b7d814c..5e0b84941e 100644 --- a/SynchronizeStateSender/src/CMakeLists.txt +++ b/SynchronizeStateSender/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=synchronizeStateSender") -add_library(SynchronizeStateSender SHARED +add_library(SynchronizeStateSender ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SynchronizeStateSenderFactory.cpp PostConnectSynchronizeStateSender.cpp) diff --git a/applications/acsdkAndroidApplicationAudioPipelineFactory/src/CMakeLists.txt b/applications/acsdkAndroidApplicationAudioPipelineFactory/src/CMakeLists.txt index 845528ba65..9d552158bf 100644 --- a/applications/acsdkAndroidApplicationAudioPipelineFactory/src/CMakeLists.txt +++ b/applications/acsdkAndroidApplicationAudioPipelineFactory/src/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) add_definitions("-DACSDK_LOG_MODULE=acsdkAndroidApplicationAudioPipelineFactory") -add_library(acsdkAndroidApplicationAudioPipelineFactory SHARED +add_library(acsdkAndroidApplicationAudioPipelineFactory ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} AndroidApplicationAudioPipelineFactory.cpp) target_include_directories(acsdkAndroidApplicationAudioPipelineFactory PUBLIC diff --git a/applications/acsdkCBLAuthorizationDelegate/src/CMakeLists.txt b/applications/acsdkCBLAuthorizationDelegate/src/CMakeLists.txt index 7a4be00fd6..20f1310a62 100644 --- a/applications/acsdkCBLAuthorizationDelegate/src/CMakeLists.txt +++ b/applications/acsdkCBLAuthorizationDelegate/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkCBLAuthorizationDelegate") -add_library(acsdkCBLAuthorizationDelegate SHARED +add_library(acsdkCBLAuthorizationDelegate ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} AuthorizationDelegateComponent.cpp) target_include_directories(acsdkCBLAuthorizationDelegate PUBLIC diff --git a/applications/acsdkCustomApplicationAudioPipelineFactory/src/CMakeLists.txt b/applications/acsdkCustomApplicationAudioPipelineFactory/src/CMakeLists.txt index 3b01711c16..5a6cc61516 100644 --- a/applications/acsdkCustomApplicationAudioPipelineFactory/src/CMakeLists.txt +++ b/applications/acsdkCustomApplicationAudioPipelineFactory/src/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) add_definitions("-DACSDK_LOG_MODULE=acsdkCustomApplicationAudioPipelineFactory") -add_library(acsdkCustomApplicationAudioPipelineFactory SHARED +add_library(acsdkCustomApplicationAudioPipelineFactory ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} CustomApplicationAudioPipelineFactory.cpp) target_include_directories(acsdkCustomApplicationAudioPipelineFactory PUBLIC diff --git a/applications/acsdkDefaultDeviceSettingsManager/src/CMakeLists.txt b/applications/acsdkDefaultDeviceSettingsManager/src/CMakeLists.txt index 7bda7a1281..269b853d33 100644 --- a/applications/acsdkDefaultDeviceSettingsManager/src/CMakeLists.txt +++ b/applications/acsdkDefaultDeviceSettingsManager/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkDefaultDeviceSettingsManager") -add_library(acsdkDefaultDeviceSettingsManager SHARED +add_library(acsdkDefaultDeviceSettingsManager ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} DeviceSettingsManagerBuilder.cpp DeviceSettingsManagerComponent.cpp) diff --git a/applications/acsdkDefaultInternetConnectionMonitor/src/CMakeLists.txt b/applications/acsdkDefaultInternetConnectionMonitor/src/CMakeLists.txt index 8e4c33ad1b..8d017dd643 100644 --- a/applications/acsdkDefaultInternetConnectionMonitor/src/CMakeLists.txt +++ b/applications/acsdkDefaultInternetConnectionMonitor/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkDefaultInternetConnectionMonitor") -add_library(acsdkDefaultInternetConnectionMonitor SHARED +add_library(acsdkDefaultInternetConnectionMonitor ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} InternetConnectionMonitorComponent.cpp) target_include_directories(acsdkDefaultInternetConnectionMonitor PUBLIC diff --git a/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt b/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt index edb0845ce3..978ca6d159 100644 --- a/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt +++ b/applications/acsdkDefaultSampleApplicationOptions/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkDefaultSampleApplicationOptions") -add_library(acsdkDefaultSampleApplicationOptions SHARED +add_library(acsdkDefaultSampleApplicationOptions ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} DefaultSampleApplicationOptionsComponent.cpp) target_include_directories(acsdkDefaultSampleApplicationOptions PUBLIC diff --git a/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/CMakeLists.txt b/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/CMakeLists.txt index 0c4f952550..9c4a15c4dd 100644 --- a/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/CMakeLists.txt +++ b/applications/acsdkGstreamerApplicationAudioPipelineFactory/src/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) add_definitions("-DACSDK_LOG_MODULE=acsdkGstreamerApplicationAudioPipelineFactory") -add_library(acsdkGstreamerApplicationAudioPipelineFactory SHARED +add_library(acsdkGstreamerApplicationAudioPipelineFactory ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} GstreamerApplicationAudioPipelineFactory.cpp) target_include_directories(acsdkGstreamerApplicationAudioPipelineFactory PUBLIC diff --git a/applications/acsdkLibcurlAlexaCommunications/src/CMakeLists.txt b/applications/acsdkLibcurlAlexaCommunications/src/CMakeLists.txt index d29350f4cf..459a10fd23 100644 --- a/applications/acsdkLibcurlAlexaCommunications/src/CMakeLists.txt +++ b/applications/acsdkLibcurlAlexaCommunications/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkLibcurlAlexaCommunications") -add_library(acsdkLibcurlAlexaCommunications SHARED +add_library(acsdkLibcurlAlexaCommunications ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} AlexaCommunicationsComponent.cpp) target_include_directories(acsdkLibcurlAlexaCommunications PUBLIC diff --git a/applications/acsdkLibcurlHTTPContentFetcher/src/CMakeLists.txt b/applications/acsdkLibcurlHTTPContentFetcher/src/CMakeLists.txt index d4f8f76c3a..8f1d4d89ed 100644 --- a/applications/acsdkLibcurlHTTPContentFetcher/src/CMakeLists.txt +++ b/applications/acsdkLibcurlHTTPContentFetcher/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkLibcurlHTTPContentFetcher") -add_library(acsdkLibcurlHTTPContentFetcher SHARED +add_library(acsdkLibcurlHTTPContentFetcher ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} HTTPContentFetcherComponent.cpp) target_include_directories(acsdkLibcurlHTTPContentFetcher PUBLIC diff --git a/applications/acsdkNullMetricRecorder/src/CMakeLists.txt b/applications/acsdkNullMetricRecorder/src/CMakeLists.txt index 037b758994..0492c178ed 100644 --- a/applications/acsdkNullMetricRecorder/src/CMakeLists.txt +++ b/applications/acsdkNullMetricRecorder/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkNullMetricRecorder") -add_library(acsdkNullMetricRecorder SHARED +add_library(acsdkNullMetricRecorder ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} MetricRecorderComponent.cpp) target_include_directories(acsdkNullMetricRecorder PUBLIC diff --git a/applications/acsdkNullSystemTimeZone/src/CMakeLists.txt b/applications/acsdkNullSystemTimeZone/src/CMakeLists.txt index ffc04bc91c..b17e58e8fa 100644 --- a/applications/acsdkNullSystemTimeZone/src/CMakeLists.txt +++ b/applications/acsdkNullSystemTimeZone/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkNullSystemTimeZone") -add_library(acsdkNullSystemTimeZone SHARED +add_library(acsdkNullSystemTimeZone ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SystemTimeZoneComponent.cpp) target_include_directories(acsdkNullSystemTimeZone PUBLIC diff --git a/applications/acsdkPreviewAlexaClient/src/CMakeLists.txt b/applications/acsdkPreviewAlexaClient/src/CMakeLists.txt index 3ff9571304..62c970ed11 100644 --- a/applications/acsdkPreviewAlexaClient/src/CMakeLists.txt +++ b/applications/acsdkPreviewAlexaClient/src/CMakeLists.txt @@ -3,7 +3,7 @@ list(APPEND LibPreviewAlexaClient_SOURCES PreviewAlexaClient.cpp PreviewAlexaClientComponent.cpp) -add_library(LibPreviewAlexaClient SHARED ${LibPreviewAlexaClient_SOURCES}) +add_library(LibPreviewAlexaClient ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} ${LibPreviewAlexaClient_SOURCES}) target_include_directories(LibPreviewAlexaClient PUBLIC "${acsdkPreviewAlexaClient_SOURCE_DIR}/include") diff --git a/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt b/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt index 8ba6722b46..ce9f560c7d 100644 --- a/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt +++ b/applications/acsdkSampleApplicationCBLAuthRequester/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkSampleApplicationCBLAuthRequester") -add_library(acsdkSampleApplicationCBLAuthRequester SHARED +add_library(acsdkSampleApplicationCBLAuthRequester ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SampleApplicationCBLAuthRequester.cpp) target_include_directories(acsdkSampleApplicationCBLAuthRequester PUBLIC diff --git a/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt b/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt index a90f19cc4d..bc1708d60f 100644 --- a/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt +++ b/capabilities/Alerts/acsdkAlerts/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=alerts") -add_library(acsdkAlerts SHARED +add_library(acsdkAlerts ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} Renderer/Renderer.cpp Storage/SQLiteAlertStorage.cpp Alarm.cpp diff --git a/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt b/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt index 3649169b11..e1a87ebb62 100644 --- a/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt +++ b/capabilities/AudioPlayer/acsdkAudioPlayer/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=audioplayer") -add_library(acsdkAudioPlayer SHARED +add_library(acsdkAudioPlayer ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} AudioPlayer.cpp AudioPlayerComponent.cpp ProgressTimer.cpp) diff --git a/capabilities/Bluetooth/acsdkBluetooth/src/CMakeLists.txt b/capabilities/Bluetooth/acsdkBluetooth/src/CMakeLists.txt index 60f011bef3..4b9f767fa1 100644 --- a/capabilities/Bluetooth/acsdkBluetooth/src/CMakeLists.txt +++ b/capabilities/Bluetooth/acsdkBluetooth/src/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions("-DACSDK_LOG_MODULE=bluetooth") add_library( - acsdkBluetooth SHARED + acsdkBluetooth ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} BasicDeviceConnectionRule.cpp Bluetooth.cpp BluetoothEventState.cpp diff --git a/capabilities/DoNotDisturb/acsdkDoNotDisturb/src/CMakeLists.txt b/capabilities/DoNotDisturb/acsdkDoNotDisturb/src/CMakeLists.txt index 44de5ed579..5e58a357fc 100644 --- a/capabilities/DoNotDisturb/acsdkDoNotDisturb/src/CMakeLists.txt +++ b/capabilities/DoNotDisturb/acsdkDoNotDisturb/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkDoNotDisturb") -add_library(acsdkDoNotDisturb SHARED +add_library(acsdkDoNotDisturb ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} DNDMessageRequest.cpp DNDSettingProtocol.cpp DoNotDisturbCapabilityAgent.cpp diff --git a/capabilities/Equalizer/acsdkEqualizer/src/CMakeLists.txt b/capabilities/Equalizer/acsdkEqualizer/src/CMakeLists.txt index 01831425a9..ea18594257 100755 --- a/capabilities/Equalizer/acsdkEqualizer/src/CMakeLists.txt +++ b/capabilities/Equalizer/acsdkEqualizer/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=equalizer") -add_library(acsdkEqualizer SHARED +add_library(acsdkEqualizer ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} EqualizerCapabilityAgent.cpp) target_include_directories(acsdkEqualizer PUBLIC diff --git a/capabilities/Equalizer/acsdkEqualizerImplementations/src/CMakeLists.txt b/capabilities/Equalizer/acsdkEqualizerImplementations/src/CMakeLists.txt index 8719dba2c2..9ad76c10ce 100755 --- a/capabilities/Equalizer/acsdkEqualizerImplementations/src/CMakeLists.txt +++ b/capabilities/Equalizer/acsdkEqualizerImplementations/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=equalizer") -add_library(acsdkEqualizerImplementations SHARED +add_library(acsdkEqualizerImplementations ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} EqualizerComponent.cpp EqualizerController.cpp EqualizerUtils.cpp diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/CMakeLists.txt b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/CMakeLists.txt index 0ec261a52f..9324fd5ece 100644 --- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/CMakeLists.txt +++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayer/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=ExternalMediaPlayer") -add_library(acsdkExternalMediaPlayer SHARED +add_library(acsdkExternalMediaPlayer ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} AuthorizedSender.cpp ExternalMediaAdapterHandler.cpp ExternalMediaPlayer.cpp diff --git a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/CMakeLists.txt b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/CMakeLists.txt index af7939294d..4b30d73ef2 100644 --- a/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/CMakeLists.txt +++ b/capabilities/ExternalMediaPlayer/acsdkExternalMediaPlayerInterfaces/src/CMakeLists.txt @@ -1,6 +1,6 @@ include(${AVS_CORE}/build/BuildDefaults.cmake) -add_library(acsdkExternalMediaPlayerInterfaces SHARED +add_library(acsdkExternalMediaPlayerInterfaces ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} AdapterUtils.cpp) target_include_directories(acsdkExternalMediaPlayerInterfaces PUBLIC diff --git a/capabilities/MultiRoomMusic/acsdkMultiRoomMusic/src/CMakeLists.txt b/capabilities/MultiRoomMusic/acsdkMultiRoomMusic/src/CMakeLists.txt index f028667c03..2cfe286766 100644 --- a/capabilities/MultiRoomMusic/acsdkMultiRoomMusic/src/CMakeLists.txt +++ b/capabilities/MultiRoomMusic/acsdkMultiRoomMusic/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkMultiRoomMusic") -add_library(acsdkMultiRoomMusic SHARED +add_library(acsdkMultiRoomMusic ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} MRMCapabilityAgent.cpp) target_include_directories(acsdkMultiRoomMusic PUBLIC diff --git a/capabilities/Notifications/acsdkNotifications/src/CMakeLists.txt b/capabilities/Notifications/acsdkNotifications/src/CMakeLists.txt index 75742aa5fb..5e94354dab 100755 --- a/capabilities/Notifications/acsdkNotifications/src/CMakeLists.txt +++ b/capabilities/Notifications/acsdkNotifications/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=Notifications") -add_library(acsdkNotifications SHARED +add_library(acsdkNotifications ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} NotificationIndicator.cpp NotificationRenderer.cpp NotificationsCapabilityAgent.cpp diff --git a/core/acsdkCore/src/CMakeLists.txt b/core/acsdkCore/src/CMakeLists.txt index 3664dbb82e..6ef009ec9c 100644 --- a/core/acsdkCore/src/CMakeLists.txt +++ b/core/acsdkCore/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkCore") -add_library(acsdkCore SHARED +add_library(acsdkCore ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} CoreComponent.cpp) target_include_directories(acsdkCore PUBLIC diff --git a/core/acsdkPostConnectOperationProviderRegistrar/src/CMakeLists.txt b/core/acsdkPostConnectOperationProviderRegistrar/src/CMakeLists.txt index 2c2ea01fa6..bba99c818a 100644 --- a/core/acsdkPostConnectOperationProviderRegistrar/src/CMakeLists.txt +++ b/core/acsdkPostConnectOperationProviderRegistrar/src/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkPostConnectOperationProviderRegistrar") -add_library(acsdkPostConnectOperationProviderRegistrar SHARED +add_library(acsdkPostConnectOperationProviderRegistrar ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} PostConnectOperationProviderRegistrar.cpp) target_include_directories(acsdkPostConnectOperationProviderRegistrar PUBLIC diff --git a/shared/acsdkManufactory/src/CMakeLists.txt b/shared/acsdkManufactory/src/CMakeLists.txt index 1eece0f433..0f3e398b7c 100644 --- a/shared/acsdkManufactory/src/CMakeLists.txt +++ b/shared/acsdkManufactory/src/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) add_definitions("-DACSDK_LOG_MODULE=Manufactory") -add_library(acsdkManufactory SHARED +add_library(acsdkManufactory ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} CookBook.cpp) target_link_libraries(acsdkManufactory AVSCommon) diff --git a/shared/acsdkShared/src/CMakeLists.txt b/shared/acsdkShared/src/CMakeLists.txt index dcb86ad13f..b4de6974a9 100644 --- a/shared/acsdkShared/src/CMakeLists.txt +++ b/shared/acsdkShared/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkShared") -add_library(acsdkShared SHARED +add_library(acsdkShared ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} SharedComponent.cpp) target_include_directories(acsdkShared PUBLIC diff --git a/shared/acsdkShutdownManager/src/CMakeLists.txt b/shared/acsdkShutdownManager/src/CMakeLists.txt index 6a1641268d..5a18cd567d 100644 --- a/shared/acsdkShutdownManager/src/CMakeLists.txt +++ b/shared/acsdkShutdownManager/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkShutdownManager") -add_library(acsdkShutdownManager SHARED +add_library(acsdkShutdownManager ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} ShutdownManager.cpp) target_include_directories(acsdkShutdownManager PUBLIC diff --git a/shared/acsdkStartupManager/src/CMakeLists.txt b/shared/acsdkStartupManager/src/CMakeLists.txt index 5b474625b0..2b52ff52d1 100644 --- a/shared/acsdkStartupManager/src/CMakeLists.txt +++ b/shared/acsdkStartupManager/src/CMakeLists.txt @@ -1,5 +1,5 @@ add_definitions("-DACSDK_LOG_MODULE=acsdkStartupManager") -add_library(acsdkStartupManager SHARED +add_library(acsdkStartupManager ${AVS_DEVICE_SDK_BUILD_LIBRARY_TYPE} StartupManager.cpp) target_include_directories(acsdkStartupManager PUBLIC From b0884d028b21868279ffe287295ffd07a264caeb Mon Sep 17 00:00:00 2001 From: Alexander Ismailov Date: Thu, 24 Dec 2020 01:25:01 +0200 Subject: [PATCH 2/2] Added ability to switch off building SampleApp since you will need only libraries. Signed-off-by: Alexander Ismailov --- SampleApp/src/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/SampleApp/src/CMakeLists.txt b/SampleApp/src/CMakeLists.txt index d2c1479431..ba63cfbf4a 100644 --- a/SampleApp/src/CMakeLists.txt +++ b/SampleApp/src/CMakeLists.txt @@ -1,3 +1,5 @@ +option(BUILD_SAMPLE_APP "SampleApp application will be built with the libraries" ON) + set(LibSampleApp_SOURCES) list(APPEND LibSampleApp_SOURCES CaptionPresenter.cpp @@ -139,10 +141,13 @@ endif() add_rpath_to_target("LibSampleApp") -add_executable(SampleApp - main.cpp) +if (BUILD_SAMPLE_APP) + add_executable(SampleApp + main.cpp) -target_link_libraries(SampleApp LibSampleApp) + target_link_libraries(SampleApp LibSampleApp) + asdk_install_targets(SampleApp TRUE) +endif() # install target asdk_install_targets(LibSampleApp TRUE) \ No newline at end of file