ElektraInitiative · mpranj · Dec 17, 2020 · Dec 5, 2020 · Dec 5, 2020 · Dec 6, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,11 @@ endif (CMAKE_VERSION VERSION_LESS 3.9)
 set (CMAKE_MACOSX_RPATH 1)
 set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 
+set (
+	CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
+	"elektra-misc"
+	CACHE STRING "Default component name" FORCE)
+
 # additional modules for loading libraries
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/scripts/cmake/Modules/")
 
@@ -85,9 +90,6 @@ set (SO_VERSION 4)
 set (SO_VERSION_TOOLS 2)
 set (SO_VERSION_GETENV 0)
 
-# needs version above
-include (scripts/cmake/ElektraPackaging.cmake)
-
 # ensure KDB_DB_SYSTEM is an absolute path
 if (NOT IS_ABSOLUTE "${KDB_DB_SYSTEM}")
 	set (KDB_DB_SYSTEM "${CMAKE_INSTALL_PREFIX}/${KDB_DB_SYSTEM}")
@@ -129,3 +131,6 @@ install (
 	FILES LICENSE.md
 	DESTINATION ${TARGET_DOCUMENTATION_TEXT_FOLDER}
 	COMPONENT libelektra4)
+
+# needs to be included last to collect all install components
+include (scripts/cmake/ElektraPackaging.cmake)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -22,7 +22,7 @@ macro (do_doc target folder file install)
 	if (ARG_COMPONENT)
 		set (HAS_COMPONENT ${ARG_COMPONENT})
 	else ()
-		set (HAS_COMPONENT "elektra-misc")
+		set (HAS_COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
 	endif ()
 
 	# sometimes doxygen is too slow and fails with "Could not create output directory .../doc/html"
@@ -97,7 +97,7 @@ if (DOXYGEN_FOUND)
 	set (outputs ${OUTPUT_DIRECTORY}/html/index.html ${OUTPUT_DIRECTORY}/man/man3elektra/kdb.3elektra)
 
 	if (WITH_LATEX)
-		do_doc (latex ${OUTPUT_DIRECTORY}/latex/ refman.tex ${TARGET_DOCUMENTATION_LATEX_FOLDER})
+		do_doc (latex ${OUTPUT_DIRECTORY}/latex/ refman.tex ${TARGET_DOCUMENTATION_LATEX_FOLDER} COMPONENT elektra-doc)
 		add_dependencies (latex man3 html)
 		list (APPEND outputs ${OUTPUT_DIRECTORY}/latex/refman.tex)
 

diff --git a/scripts/cmake/ElektraPackaging.cmake b/scripts/cmake/ElektraPackaging.cmake
@@ -1,5 +1,4 @@
 set (PACKAGE_NAME "elektra")
-set (CPACK_PACKAGE_NAME "${PACKAGE_NAME}")
 set (PACKAGE_URL "https://www.libelektra.org/")
 set (PACKAGE_BUGREPORT "https://bugs.libelektra.org/")
 
@@ -14,7 +13,7 @@ set (CPACK_DEBIAN_PACKAGE_MAINTAINER "Robert Sowula <[email protected]>")
 set (CPACK_OUTPUT_FILE_PREFIX "packages")
 
 set (
-	CPACK_COMPONENTS_ALL
+	DEBIAN_PACKAGES
 	libelektra4
 	libelektra4-all
 	libelektra4-full
@@ -25,13 +24,16 @@ set (
 	libelektra4-curl
 	libelektra4-dbus
 	libelektra-dev
+	libelektra4-java
 	libelektra4-journald
 	libelektra4-lua
 	libelektra4-python
 	libelektra4-xerces
 	libelektra4-xmltool
 	libelektra4-yajl
+	libelektra4-yamlcpp
 	libelektra4-zeromq
+	java-elektra
 	lua-elektra
 	python3-elektra
 	elektra-bin
@@ -40,21 +42,30 @@ set (
 	elektra-qt-gui
 	elektra-tests
 	elektra-dbg
-	elektra-misc)
+	${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
 
-set (COMPONENTS_WITHOUT_DBGSYM elektra-doc elektra-dbg libelektra-dev libelektra4-all elektra-bin-extra)
+set (
+	COMPONENTS_WITHOUT_DBGSYM
+	elektra-doc
+	elektra-dbg
+	libelektra-dev
+	libelektra4-all
+	libelektra4-yamlcpp
+	elektra-bin-extra
+	java-elektra
+	${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
 
 set (ALL_PLUGINS "")
-foreach (component ${CPACK_COMPONENTS_ALL})
+foreach (component ${DEBIAN_PACKAGES})
 	if (component MATCHES "^libelektra4-.*")
 		list (APPEND ALL_PLUGINS "${component}")
 	endif ()
 endforeach ()
 string (REPLACE ";" ", " ALL_PLUGINS_STR "${ALL_PLUGINS}")
 
 set (DBG_PACKAGE_NAMES "")
-foreach (component ${CPACK_COMPONENTS_ALL})
-	if (NOT component IN_LIST COMPONENTS_WITHOUT_DBGSYM AND NOT component STREQUAL "elektra-misc")
+foreach (component ${DEBIAN_PACKAGES})
+	if (NOT component IN_LIST COMPONENTS_WITHOUT_DBGSYM)
 		list (APPEND DBG_PACKAGE_NAMES "${component}-dbgsym")
 	endif ()
 endforeach ()
@@ -108,6 +119,7 @@ if (UNIX)
 	if (NOT LSB_DISTRIB)
 		set (LSB_DISTRIB "unix")
 	endif (NOT LSB_DISTRIB)
+	message (STATUS "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME: ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}")
 
 	# For Debian-based distros we want to create DEB packages.
 	if ("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
@@ -268,13 +280,34 @@ if (UNIX)
 		set (CPACK_DEBIAN_LIBELEKTRA4-JOURNALD_PACKAGE_SECTION "libs")
 		set (CPACK_DEBIAN_LIBELEKTRA4-JOURNALD_DEBUGINFO_PACKAGE "ON")
 
+		set (CPACK_DEBIAN_LIBELEKTRA4-YAMLCPP_PACKAGE_NAME "libelektra4-yamlcpp")
+		set (CPACK_COMPONENT_LIBELEKTRA4-YAMLCPP_DISPLAY_NAME "libelektra4-yamlcpp")
+		set (CPACK_COMPONENT_LIBELEKTRA4-YAMLCPP_DESCRIPTION "This package contains the 'yamlcpp' plugin.")
+		set (CPACK_COMPONENT_LIBELEKTRA4-YAMLCPP_DEPENDS "libelektra4")
+		set (CPACK_DEBIAN_LIBELEKTRA4-YAMLCPP_PACKAGE_SECTION "libs")
+
 		set (CPACK_DEBIAN_LIBELEKTRA4-LUA_PACKAGE_NAME "libelektra4-lua")
 		set (CPACK_COMPONENT_LIBELEKTRA4-LUA_DISPLAY_NAME "libelektra4-lua")
 		set (CPACK_COMPONENT_LIBELEKTRA4-LUA_DESCRIPTION "This package contains the 'lua' plugin.")
 		set (CPACK_COMPONENT_LIBELEKTRA4-LUA_DEPENDS "libelektra4")
 		set (CPACK_DEBIAN_LIBELEKTRA4-LUA_PACKAGE_SECTION "libs")
 		set (CPACK_DEBIAN_LIBELEKTRA4-LUA_DEBUGINFO_PACKAGE "ON")
 
+		set (CPACK_DEBIAN_LIBELEKTRA4-JAVA_PACKAGE_NAME "libelektra4-java")
+		set (CPACK_COMPONENT_LIBELEKTRA4-JAVA_DISPLAY_NAME "libelektra4-java")
+		set (CPACK_COMPONENT_LIBELEKTRA4-JAVA_DESCRIPTION "This package contains the 'jni' plugin.")
+		set (CPACK_COMPONENT_LIBELEKTRA4-JAVA_DEPENDS "libelektra4" "java-elektra")
+		set (CPACK_DEBIAN_LIBELEKTRA4-JAVA_PACKAGE_DEPENDS "default-jdk")
+		set (CPACK_DEBIAN_LIBELEKTRA4-JAVA_PACKAGE_SECTION "libs")
+		set (CPACK_DEBIAN_LIBELEKTRA4-JAVA_DEBUGINFO_PACKAGE "ON")
+
+		set (CPACK_DEBIAN_JAVA-ELEKTRA_PACKAGE_NAME "java-elektra")
+		set (CPACK_COMPONENT_JAVA-ELEKTRA_DISPLAY_NAME "java-elektra")
+		set (CPACK_COMPONENT_JAVA-ELEKTRA_DESCRIPTION "This package contains the Java bindings.")
+		set (CPACK_COMPONENT_JAVA-ELEKTRA_DEPENDS "libelektra4")
+		set (CPACK_DEBIAN_JAVA-ELEKTRA_PACKAGE_DEPENDS "default-jdk")
+		set (CPACK_DEBIAN_JAVA-ELEKTRA_PACKAGE_SECTION "java")
+
 		set (CPACK_DEBIAN_LUA-ELEKTRA_PACKAGE_NAME "lua-elektra")
 		set (CPACK_COMPONENT_LUA-ELEKTRA_DISPLAY_NAME "lua-elektra")
 		set (CPACK_COMPONENT_LUA-ELEKTRA_DESCRIPTION "This package contains the Lua bindings.")
@@ -369,11 +402,13 @@ if (UNIX)
 			"libelektra4-augeas"
 			"libelektra4-dbus"
 			"libelektra4-zeromq"
+			"libelektra4-java"
 			"libelektra4-lua"
 			"libelektra4-python"
 			"libelektra4-xmltool"
 			"libelektra4-xerces"
 			"libelektra4-yajl"
+			"libelektra4-yamlcpp"
 			"lua-elektra"
 			"elektra-bin"
 			"elektra-qt-gui"
@@ -400,11 +435,10 @@ if (UNIX)
 		     "This package contains all files not part of any of the released Elektra packages.")
 		set (CPACK_DEBIAN_ELEKTRA-MISC_PACKAGE_ARCHITECTURE "all")
 		set (CPACK_DEBIAN_ELEKTRA-MISC_PACKAGE_SECTION "misc")
-		set (CPACK_DEBIAN_ELEKTRA-MISC_DEBUGINFO_PACKAGE "ON")
 
 		# install copyright file
 		configure_file ("${CMAKE_SOURCE_DIR}/doc/THIRD-PARTY-LICENSES" "${CMAKE_BINARY_DIR}/doc/copyright" COPYONLY)
-		foreach (component ${CPACK_COMPONENTS_ALL})
+		foreach (component ${DEBIAN_PACKAGES})
 			install (
 				FILES "${CMAKE_BINARY_DIR}/doc/copyright"
 				COMPONENT ${component}
@@ -420,7 +454,7 @@ if (UNIX)
 
 		add_custom_target (changelog ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/changelog.Debian.gz")
 
-		foreach (component ${CPACK_COMPONENTS_ALL})
+		foreach (component ${DEBIAN_PACKAGES})
 			install (
 				FILES "${CMAKE_CURRENT_BINARY_DIR}/changelog.Debian.gz"
 				COMPONENT ${component}
@@ -473,3 +507,10 @@ set (
 	"%ignore /usr/share/man")
 
 include (CPack)
+
+foreach (component ${CPACK_COMPONENTS_ALL})
+	if (NOT component IN_LIST DEBIAN_PACKAGES)
+		message (SEND_ERROR "Component ${component} is not
+part of DEBIAN_PACKAGES (ElektraPackaging.cmake). Please add it to this list, so the dependencies can be derived correctly.")
+	endif ()
+endforeach ()
diff --git a/scripts/cmake/Modules/LibAddLib.cmake b/scripts/cmake/Modules/LibAddLib.cmake
@@ -26,7 +26,7 @@ function (add_lib name)
 	if (ARG_COMPONENT)
 		set (HAS_COMPONENT ${ARG_COMPONENT})
 	else ()
-		set (HAS_COMPONENT "elektra-misc")
+		set (HAS_COMPONENT "${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}")
 	endif ()
 
 	add_library (elektra-${name}-objects OBJECT ${ARG_SOURCES})

diff --git a/scripts/cmake/Modules/LibAddMacros.cmake b/scripts/cmake/Modules/LibAddMacros.cmake
@@ -624,7 +624,7 @@ function (generate_manpage NAME)
 		if (ARG_COMPONENT)
 			set (HAS_COMPONENT ${ARG_COMPONENT})
 		else ()
-			set (HAS_COMPONENT "elektra-misc")
+			set (HAS_COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME})
 		endif ()
 
 		set (MAN_PAGE_LOCATION "doc/man/man${SECTION}/${NAME}.${SECTION}")

diff --git a/scripts/cmake/Modules/LibAddPlugin.cmake b/scripts/cmake/Modules/LibAddPlugin.cmake
@@ -439,7 +439,7 @@ function (add_plugin PLUGIN_SHORT_NAME)
 	if (ARG_COMPONENT)
 		set (HAS_COMPONENT ${ARG_COMPONENT})
 	else ()
-		set (HAS_COMPONENT "elektra-misc")
+		set (HAS_COMPONENT "${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}")
 	endif ()
 
 	if (ADDTESTING_PHASE)

diff --git a/scripts/kdb/CMakeLists.txt b/scripts/kdb/CMakeLists.txt
@@ -12,17 +12,13 @@ endforeach (file ${IN_FILES})
 
 set (COMPONENT_BIN_EXTRA_FILES "find-tools" "mount-list-all-files" "mountpoint-info")
 
-set (NOT_INCLUDE "cmerge-config-files" "install-config-file")
-
 file (GLOB ALL_FILES *)
 list (REMOVE_ITEM ALL_FILES ${IN_FILES})
 list (REMOVE_ITEM ALL_FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
 foreach (file ${ALL_FILES})
 	get_filename_component (file_we "${file}" NAME_WE)
 	if ("${file_we}" IN_LIST COMPONENT_BIN_EXTRA_FILES)
 		set (HAS_COMPONENT elektra-bin-extra)
-	elseif ("${file_we}" IN_LIST NOT_INCLUDE)
-		set (HAS_COMPONENT "")
 	else ()
 		set (HAS_COMPONENT elektra-bin)
 	endif ()

diff --git a/scripts/packaging/package.sh b/scripts/packaging/package.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-ELEKTRA_PLUGINS='ALL;mozprefs;multifile;-gitresolver;-jni;-ruby;-haskell;-yamlcpp;toml'
+ELEKTRA_PLUGINS='ALL;mozprefs;multifile;-gitresolver;jni;-ruby;-haskell;yamlcpp;toml'
 ELEKTRA_TOOLS='ALL'
-ELEKTRA_BINDINGS='cpp;lua;python;INTERCEPT'
+ELEKTRA_BINDINGS='cpp;lua;python;jna;INTERCEPT'
 
 # workaround for hardening flags
 CPPFLAGS=$(dpkg-buildflags --get CPPFLAGS)

diff --git a/src/bindings/glib/CMakeLists.txt b/src/bindings/glib/CMakeLists.txt
@@ -42,12 +42,9 @@ target_compile_options (${GELEKTRA_LIBRARY} PUBLIC ${GOBJECT_CFLAGS_OTHER})
 target_link_libraries (${GELEKTRA_LIBRARY} PUBLIC elektra-core elektra-kdb)
 target_link_libraries (${GELEKTRA_LIBRARY} PUBLIC ${GOBJECT_LDFLAGS})
 
-install (TARGETS ${GELEKTRA_LIBRARY} LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT elektra-misc)
+install (TARGETS ${GELEKTRA_LIBRARY} LIBRARY DESTINATION lib${LIB_SUFFIX})
 
-install (
-	FILES ${GELEKTRA_HDR_FILES}
-	DESTINATION include/${TARGET_INCLUDE_FOLDER}
-	COMPONENT elektra-misc)
+install (FILES ${GELEKTRA_HDR_FILES} DESTINATION include/${TARGET_INCLUDE_FOLDER})
 
 configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/gelektra-constants.h.in" "${CMAKE_CURRENT_BINARY_DIR}/gelektra-constants.h" @ONLY)
 
@@ -56,7 +53,7 @@ configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/gelektra.pc.in" "${CMAKE_CURRENT_BI
 install (
 	FILES "${CMAKE_CURRENT_BINARY_DIR}/${GELEKTRA_LIBRARY}.pc"
 	DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}
-	COMPONENT elektra-misc)
+	COMPONENT libelektra-dev)
 
 if (BUILD_TESTING)
 	add_subdirectory (tests)

diff --git a/src/bindings/gsettings/CMakeLists.txt b/src/bindings/gsettings/CMakeLists.txt
@@ -57,7 +57,7 @@ if (GELEKTRA_LIBRARY)
 	include_directories (${CMAKE_BINARY_DIR}/src/include/)
 	target_link_libraries (elektrasettings ${GLIB_LIBRARIES} ${GMODULE_LIBRARIES} ${GIO_LIBRARIES} ${GELEKTRA_LIBRARY} elektra-core)
 	if (INSTALL_SYSTEM_FILES)
-		install (TARGETS elektrasettings LIBRARY DESTINATION ${GIO_MODULE_DIR} COMPONENT elektra-misc)
+		install (TARGETS elektrasettings LIBRARY DESTINATION ${GIO_MODULE_DIR})
 	endif ()
 else ()
 	pkg_get_variable (GIO_MODULE_DIR gio-2.0 giomoduledir)
@@ -67,7 +67,7 @@ else ()
 	endif ()
 	include_directories (${GELEKTRA_INCLUDE_DIRS})
 	target_link_libraries (elektrasettings ${GLIB_LIBRARIES} ${GMODULE_LIBRARIES} ${GIO_LIBRARIES} ${GELEKTRA_LIBRARIES})
-	install (TARGETS elektrasettings LIBRARY DESTINATION ${GIO_MODULE_DIR} COMPONENT elektra-misc)
+	install (TARGETS elektrasettings LIBRARY DESTINATION ${GIO_MODULE_DIR})
 endif ()
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

diff --git a/src/bindings/intercept/env/CMakeLists.txt b/src/bindings/intercept/env/CMakeLists.txt
@@ -14,7 +14,7 @@ else ()
 	set (NAME elektrify-getenv)
 
 	generate_readme (${NAME})
-	generate_manpage (kdb-${NAME} FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
+	generate_manpage (kdb-${NAME} FILENAME ${CMAKE_CURRENT_SOURCE_DIR}/README.md COMPONENT elektra-bin)
 	include_directories (${CMAKE_CURRENT_BINARY_DIR})
 
 	add_subdirectory (src)

diff --git a/src/bindings/io/doc/CMakeLists.txt b/src/bindings/io/doc/CMakeLists.txt
@@ -25,12 +25,9 @@ target_include_directories (${IO_VARIANT_LIBRARY} PUBLIC ${CMAKE_CURRENT_SOURCE_
 # ~~~
 target_link_elektra (${IO_VARIANT_LIBRARY} elektra-io)
 
-install (TARGETS ${IO_VARIANT_LIBRARY} LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT elektra-misc)
+install (TARGETS ${IO_VARIANT_LIBRARY} LIBRARY DESTINATION lib${LIB_SUFFIX})
 
-install (
-	FILES ${IO_VARIANT_HDR_FILES}
-	DESTINATION include/${TARGET_INCLUDE_FOLDER}
-	COMPONENT elektra-misc)
+install (FILES ${IO_VARIANT_HDR_FILES} DESTINATION include/${TARGET_INCLUDE_FOLDER})
 
 # configure_file ( "${CMAKE_CURRENT_SOURCE_DIR}/${IO_VARIANT_LIBRARY}.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${IO_VARIANT_LIBRARY}.pc" @ONLY )
 

diff --git a/src/bindings/io/ev/CMakeLists.txt b/src/bindings/io/ev/CMakeLists.txt
@@ -32,7 +32,7 @@ else () # Build library
 	install (
 		FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_VARIANT_LIBRARY}.pc"
 		DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}
-		COMPONENT elektra-misc)
+		COMPONENT libelektra-dev)
 
 	# Build test
 	set (testexename testio_${BINDING_VARIANT})

diff --git a/src/bindings/io/glib/CMakeLists.txt b/src/bindings/io/glib/CMakeLists.txt
@@ -37,7 +37,7 @@ else ()
 	install (
 		FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_VARIANT_LIBRARY}.pc"
 		DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}
-		COMPONENT elektra-misc)
+		COMPONENT libelektra-dev)
 
 	# Build test
 	set (testexename testio_${BINDING_VARIANT})

diff --git a/src/bindings/io/uv/CMakeLists.txt b/src/bindings/io/uv/CMakeLists.txt
@@ -45,7 +45,7 @@ else ()
 	install (
 		FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_UV_LIBRARY}.pc"
 		DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}
-		COMPONENT elektra-misc)
+		COMPONENT libelektra-dev)
 
 	# Build test
 	set (TESTEXENAME testio_${BINDING_VARIANT})

diff --git a/src/bindings/jna/CMakeLists.txt b/src/bindings/jna/CMakeLists.txt
@@ -102,8 +102,8 @@ if (Java_JAVAC_EXECUTABLE)
 				WORKING_DIRECTORY libelektra4j
 				DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libelektra4j/pom.xml" ${JNA_BINDING_SOURCE_FILES})
 
-			create_lib_symlink (libelektra4j-${KDB_VERSION}.jar libelektra4j.jar JAVA)
-			create_lib_symlink (libelektra4j-${KDB_VERSION}.pom.xml libelektra4j.pom.xml JAVA)
+			create_lib_symlink (libelektra4j-${KDB_VERSION}.jar libelektra4j.jar java-elektra JAVA)
+			create_lib_symlink (libelektra4j-${KDB_VERSION}.pom.xml libelektra4j.pom.xml java-elektra JAVA)
 
 			add_custom_target (jna ALL
 					   DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libelektra4j/target/libelektra4j-${KDB_VERSION}.jar")
@@ -112,7 +112,7 @@ if (Java_JAVAC_EXECUTABLE)
 				FILES "${CMAKE_CURRENT_BINARY_DIR}/libelektra4j/target/libelektra4j-${KDB_VERSION}.jar"
 				      "${CMAKE_CURRENT_BINARY_DIR}/libelektra4j/libelektra4j-${KDB_VERSION}.pom.xml"
 				DESTINATION "share/java"
-				COMPONENT elektra-misc)
+				COMPONENT java-elektra)
 
 			# and add maven test to execute with ctest in the testing phase
 			if ((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND NOT (CMAKE_SYSTEM_VERSION VERSION_LESS 15))

diff --git a/src/bindings/swig/ruby/CMakeLists.txt b/src/bindings/swig/ruby/CMakeLists.txt
@@ -151,11 +151,8 @@ else ()
 		message (STATUS "Ruby module install path: ${RUBY_MODULE_INSTALL_DIR}")
 	endif ()
 
-	install (TARGETS swig-ruby swig-ruby-tools LIBRARY DESTINATION ${RUBY_LIB_INSTALL_DIR} COMPONENT elektra-misc)
-	install (
-		FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdb.rb ${CMAKE_CURRENT_SOURCE_DIR}/kdbtools.rb
-		DESTINATION ${RUBY_MODULE_INSTALL_DIR}
-		COMPONENT elektra-misc)
+	install (TARGETS swig-ruby swig-ruby-tools LIBRARY DESTINATION ${RUBY_LIB_INSTALL_DIR})
+	install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdb.rb ${CMAKE_CURRENT_SOURCE_DIR}/kdbtools.rb DESTINATION ${RUBY_MODULE_INSTALL_DIR})
 
 	include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 	if (BUILD_TESTING)