CMake: adopt CMAKE_INSTALL_LIBDIR for more locations (#301)

WebPlatformForEmbedded · May 23, 2024 · be2bfa4 · be2bfa4
1 parent dc0c10e
commit be2bfa4
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 25 deletions.
diff --git a/DeviceIdentification/CMakeLists.txt b/DeviceIdentification/CMakeLists.txt
@@ -130,6 +130,6 @@ target_include_directories(${MODULE_NAME}
         ${CMAKE_CURRENT_LIST_DIR})
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/DeviceInfo/CMakeLists.txt b/DeviceInfo/CMakeLists.txt
@@ -55,6 +55,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/DisplayInfo/CMakeLists.txt b/DisplayInfo/CMakeLists.txt
@@ -52,7 +52,7 @@ find_package(LibDRM QUIET)
 find_path (STAGING_INCDIR glib-2.0)
 include_directories(include)
 include_directories(${STAGING_INCDIR})
-include_directories(${STAGING_INCDIR}/libdrm)
+include_directories(${STAGING_INCDIR}/${CMAKE_INSTALL_LIBDIR}drm)
 
 add_library(${MODULE_NAME} SHARED
     DisplayInfo.cpp
@@ -147,6 +147,6 @@ else ()
 endif ()
 
 install(TARGETS ${MODULE_NAME}
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/LocationSync/CMakeLists.txt b/LocationSync/CMakeLists.txt
@@ -59,6 +59,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/MessageControl/CMakeLists.txt b/MessageControl/CMakeLists.txt
@@ -60,6 +60,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Messaging::${NAMESPACE}Messaging)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/MessageControl/MessageControl.h b/MessageControl/MessageControl.h
@@ -221,7 +221,7 @@ namespace Plugin {
                 // Seems the ID is already in here, thats odd, and impossible :-)
                 Observers::iterator index = _observing.find(id);
 
-                ASSERT(index != _observing.end());
+                // ASSERT(index != _observing.end());
 
                 if (index != _observing.end()) {
                     if (index->second == state::ATTACHING) {

diff --git a/Messenger/CMakeLists.txt b/Messenger/CMakeLists.txt
@@ -62,7 +62,7 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Definitions::${NAMESPACE}Definitions)
 
 install(TARGETS ${MODULE_NAME}
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
 
diff --git a/Monitor/CMakeLists.txt b/Monitor/CMakeLists.txt
@@ -97,6 +97,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/OpenCDMi/CMakeLists.txt b/OpenCDMi/CMakeLists.txt
@@ -65,11 +65,11 @@ target_link_libraries(${MODULE_NAME}
                 ${NAMESPACE}Plugins::${NAMESPACE}Plugins )
 # Library definition section
 install(TARGETS ${MODULE_NAME} 
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${STORAGE_DIRECTORY}/plugins)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 
 # Library installation section
 string(TOLOWER ${NAMESPACE} STORAGENAME)
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${STORAGENAME}/plugins)
+install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGENAME}/plugins)
 
 write_config()
diff --git a/Packager/CMakeLists.txt b/Packager/CMakeLists.txt
@@ -67,7 +67,7 @@ endif (libprovision_FOUND)
 
 string(TOLOWER ${NAMESPACE} STORAGENAME)
 install(TARGETS ${MODULE_NAME}
-    DESTINATION lib/${STORAGENAME}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGENAME}/plugins)
 
 configure_file(
         "${CMAKE_CURRENT_LIST_DIR}/opkg.conf.in"

diff --git a/PerformanceMetrics/CMakeLists.txt b/PerformanceMetrics/CMakeLists.txt
@@ -73,7 +73,7 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 if(PLUGIN_PERFORMANCEMETRICS_WEBKITBROWSER OR PLUGIN_PERFORMANCEMETRICS_WEBKITBROWSER_CLASSNAME)
     write_config( PLUGINS PerfMetricsWebKitBrowser )

diff --git a/PlayerInfo/CMakeLists.txt b/PlayerInfo/CMakeLists.txt
@@ -105,6 +105,6 @@ if (DOLBY_SUPPORT)
 endif()
 
 install(TARGETS ${MODULE_NAME}
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/RustBridge/CMakeLists.txt b/RustBridge/CMakeLists.txt
@@ -40,6 +40,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config(${PLUGIN_NAME})
diff --git a/SecurityAgent/CMakeLists.txt b/SecurityAgent/CMakeLists.txt
@@ -71,6 +71,6 @@ if (SECAPI)
 endif()
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/WebBridge/CMakeLists.txt b/WebBridge/CMakeLists.txt
@@ -49,6 +49,6 @@ target_link_libraries(${MODULE_NAME}
         ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
 
 install(TARGETS ${MODULE_NAME} 
-    DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins)
 
 write_config()
diff --git a/WebKitBrowser/CMakeLists.txt b/WebKitBrowser/CMakeLists.txt
@@ -315,20 +315,20 @@ set_target_properties(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} PROPERTIES
 
 install(
     TARGETS ${MODULE_NAME}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${STORAGE_DIRECTORY}/plugins
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins
     COMPONENT ${PROJECT_NAME})
 
 install(
     TARGETS ${PLUGIN_WEBKITBROWSER_IMPLEMENTATION}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${STORAGE_DIRECTORY}/plugins
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins
     COMPONENT ${PROJECT_NAME})
 
-if(WEBKIT_GLIB_API)
-    add_subdirectory(Extension)
-else()
-    # also build injected bundle
-    add_subdirectory(InjectedBundle)
-endif()
+# if(WEBKIT_GLIB_API)
+#     add_subdirectory(Extension)
+# else()
+#     # also build injected bundle
+#     add_subdirectory(InjectedBundle)
+# endif()
 
 # resolution handling
 if(PLUGIN_WEBKITBROWSER_RESOLUTION EQUAL "720p")