Development/cmake enhancements (#308)

* cmake: set minimum required cmake to 3.15

* cmake: remove empty lines

* cmake: Introduce cmake components

* DisplayInfo: remove hardcoded linking

CMakeLists.txt

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 project(NanoServicesRDK)
 
 find_package(Thunder)

DeviceIdentification/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(DeviceIdentification)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -130,6 +130,6 @@ target_include_directories(${MODULE_NAME}
         ${CMAKE_CURRENT_LIST_DIR})
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

DeviceInfo/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(DeviceInfo)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -55,6 +55,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

DisplayInfo/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(DisplayInfo)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -49,10 +49,6 @@ find_package(BCM_HOST QUIET)
 find_package(NEXUS QUIET)
 find_package(NXCLIENT QUIET)
 find_package(LibDRM QUIET)
-find_path (STAGING_INCDIR glib-2.0)
-include_directories(include)
-include_directories(${STAGING_INCDIR})
-include_directories(${STAGING_INCDIR}/${CMAKE_INSTALL_LIBDIR}drm)
 
 add_library(${MODULE_NAME} SHARED
     DisplayInfo.cpp
@@ -141,12 +137,12 @@ elseif (LIBDRM_FOUND)
 
     target_link_libraries(${MODULE_NAME}
         PRIVATE
-            drm)
+            libdrm::libdrm)
 else ()
     message(FATAL_ERROR "There is no graphic backend for display info plugin")
 endif ()
 
 install(TARGETS ${MODULE_NAME}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

DisplayInfo/cmake/FindLibDRM.cmake

@@ -1,7 +1,7 @@
 # If not stated otherwise in this file or this component's license file the
 # following copyright and licenses apply:
 #
-# Copyright 2020 RDK Management
+# Copyright 2020 Metrological B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,49 +15,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.7)
-
-# Be compatible even if a newer CMake version is available
-cmake_policy(VERSION 3.7...3.12)
-
 if(LibDRM_FIND_QUIETLY)
-    set(_LIBDRM_MODE QUIET)
+    set(_LibDRM_MODE QUIET)
 elseif(LibDRM_FIND_REQUIRED)
-    set(_LIBDRM_MODE REQUIRED)
+    set(_LibDRM_MODE REQUIRED)
 endif()
 
 find_package(PkgConfig)
 
 # Just check if the libdrm.pc exist, and create the PkgConfig::libdrm target
 # No version requirement (yet)
-pkg_check_modules(LIBDRM ${_LIBDRM_MODE} IMPORTED_TARGET libdrm)
-
-find_library(LIBDRM_ACTUAL_LIBRARY NAMES drm
-    HINTS ${LIBDRM_LIBRARY_DIRS} )
+pkg_check_modules(LibDRM ${_LibDRM_MODE} IMPORTED_TARGET libdrm)
 
 include(FindPackageHandleStandardArgs)
 
 # Sets the FOUND variable to TRUE if all required variables are present and set
 find_package_handle_standard_args(
     LibDRM
     REQUIRED_VARS
-        LIBDRM_INCLUDE_DIRS
-        LIBDRM_CFLAGS
-        LIBDRM_LDFLAGS
-        LIBDRM_LIBRARIES
-        LIBDRM_ACTUAL_LIBRARY
+        LibDRM_INCLUDE_DIRS
+        LibDRM_CFLAGS
+        LibDRM_LDFLAGS
+        LibDRM_LIBRARIES
+        LibDRM_ACTUAL_LIBRARY
     VERSION_VAR
-        LIBDRM_VERSION
+        LibDRM_VERSION
 )
-mark_as_advanced(LIBDRM_INCLUDE_DIRS LIBDRM_LIBRARIES)
-set(LIBDRM_FOUND ${LibDRM_FOUND})
+mark_as_advanced(LibDRM_INCLUDE_DIRS LibDRM_LIBRARIES)
 
-if(LibDRM_FOUND AND NOT TARGET LibDRM::LibDRM)
-    add_library(LibDRM::LibDRM UNKNOWN IMPORTED)
-    set_target_properties(LibDRM::LibDRM PROPERTIES
-        IMPORTED_LOCATION "${LIBDRM_ACTUAL_LIBRARY}"
-        INTERFACE_LINK_LIBRARIES "${LIBDRM_LIBRARIES}"
-        INTERFACE_COMPILE_OPTIONS "${LIBDRM_CFLAGS}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBDRM_INCLUDE_DIRS}"
-        )
-endif()
+if(LibDRM_FOUND)
+   add_library(libdrm::libdrm ALIAS PkgConfig::LibDRM)
+endif()

LocationSync/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(LocationSync)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -59,6 +59,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

MessageControl/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(MessageControl)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -60,6 +60,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Messaging::${NAMESPACE}Messaging)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

Messenger/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(Messenger)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -62,7 +62,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
 install(TARGETS ${MODULE_NAME}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()
-

Monitor/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(Monitor)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -97,6 +97,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

OpenCDMi/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(OCDM)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -65,11 +65,6 @@ target_link_libraries(${MODULE_NAME}
                 ${NAMESPACE}Plugins::${NAMESPACE}Plugins )
 # Library definition section
 install(TARGETS ${MODULE_NAME} 
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
-
-
-# Library installation section
-string(TOLOWER ${NAMESPACE} STORAGENAME)
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGENAME}/plugins)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

Packager/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(Packager)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -67,7 +67,7 @@ endif (libprovision_FOUND)
 
 string(TOLOWER ${NAMESPACE} STORAGENAME)
 install(TARGETS ${MODULE_NAME}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGENAME}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGENAME}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 configure_file(
         "${CMAKE_CURRENT_LIST_DIR}/opkg.conf.in"

PerformanceMetrics/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(PerformanceMetrics)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -73,7 +73,7 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 if(PLUGIN_PERFORMANCEMETRICS_WEBKITBROWSER OR PLUGIN_PERFORMANCEMETRICS_WEBKITBROWSER_CLASSNAME)
     write_config( PLUGINS PerfMetricsWebKitBrowser )
@@ -94,5 +94,3 @@ endif()
 if(PLUGIN_PERFORMANCEMETRICS_WEBKITBROWSER_YOUTUBE)
     write_config( PLUGINS PerfMetricsYouTube )
 endif()
-
-

PlayerInfo/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(PlayerInfo)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -105,6 +105,6 @@ if (DOLBY_SUPPORT)
 endif()
 
 install(TARGETS ${MODULE_NAME}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

PlayerInfo/Dolby/CMakeLists.txt

@@ -55,5 +55,3 @@ if(${DOLBY_IMPLEMENTATION} STREQUAL "AMLogic")
 else()
     message(SEND_ERROR "No DOLBY_IMPLEMENTATION picked. Turn off dolby support or pick one.")
 endif()
-
-

RustBridge/CMakeLists.txt

@@ -40,6 +40,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

SecurityAgent/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(SecurityAgent)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -71,6 +71,6 @@ if (SECAPI)
 endif()
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()

WebBridge/CMakeLists.txt

@@ -17,7 +17,7 @@
 
 project(WebBridge)
 
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.15)
 
 find_package(Thunder)
 
@@ -49,6 +49,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
 
 write_config()