Rename LIBDNF/LIBDNF5 in Cmake files

CMakeLists.txt

@@ -1,9 +1,9 @@
-message("Running CMake on libdnf...")
+message("Running CMake on dnf5...")
 cmake_minimum_required(VERSION 3.5)
 
 
 include(VERSION.cmake)
-project(libdnf LANGUAGES CXX C VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+project(dnf5 LANGUAGES CXX C VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 cmake_policy(VERSION ${CMAKE_VERSION})
 
 
@@ -20,11 +20,11 @@ endif()
 # build options - components (sub-packages)
 option(WITH_DNF5DAEMON_CLIENT "Build command-line interface for Dnf5daemon" ON)
 option(WITH_DNF5DAEMON_SERVER "Build package management service with a DBus interface" ON)
-option(WITH_LIBDNF_CLI "Build library for working with a terminal in a command-line package manager" ON)
+option(WITH_LIBDNF5_CLI "Build library for working with a terminal in a command-line package manager" ON)
 option(WITH_DNF5 "Build dnf5 command-line package manager" ON)
 option(WITH_DNF5_PLUGINS "Build plugins for dnf5 command-line package manager" ON)
-option(WITH_PLUGIN_ACTIONS "Build a libdnf actions plugin" ON)
-option(WITH_PYTHON_PLUGINS_LOADER "Build a special libdnf plugin that loads Python plugins. Requires WITH_PYTHON3=ON." ON)
+option(WITH_PLUGIN_ACTIONS "Build a dnf5 actions plugin" ON)
+option(WITH_PYTHON_PLUGINS_LOADER "Build a special dnf5 plugin that loads Python plugins. Requires WITH_PYTHON3=ON." ON)
 
 # build options - features
 option(WITH_COMPS "Build with comps groups and environments support" ON)

bindings/CMakeLists.txt

@@ -48,11 +48,11 @@ endif()
 
 
 # list of all modules that will be included in libdnf bindings
-list(APPEND SWIG_LIBDNF_MODULES base common comps conf logger repo rpm transaction plugin)
+list(APPEND SWIG_LIBDNF5_MODULES base common comps conf logger repo rpm transaction plugin)
 
 
 # list of all modules that will be included in libdnf-cli bindings
-list(APPEND SWIG_LIBDNF_CLI_MODULES progressbar)
+list(APPEND SWIG_LIBDNF5_CLI_MODULES progressbar)
 
 
 add_subdirectory(go)

bindings/go/libdnf5/CMakeLists.txt

@@ -1,6 +1,6 @@
-message("Building bindings for go: libdnf")
+message("Building bindings for go: libdnf5")
 
 
-foreach(MODULE_NAME ${SWIG_LIBDNF_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_MODULES})
     add_go_module(libdnf5 ${MODULE_NAME})
 endforeach()

bindings/go/libdnf5_cli/CMakeLists.txt

@@ -1,11 +1,11 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 
 
-message("Building bindings for go: libdnf_cli")
+message("Building bindings for go: libdnf5_cli")
 
 
-foreach(MODULE_NAME ${SWIG_LIBDNF_CLI_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_CLI_MODULES})
     add_go_module(libdnf5_cli ${MODULE_NAME})
 endforeach()

bindings/perl5/libdnf5/CMakeLists.txt

@@ -1,6 +1,6 @@
-message("Building bindings for perl5: libdnf")
+message("Building bindings for perl5: libdnf5")
 
 
-foreach(MODULE_NAME ${SWIG_LIBDNF_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_MODULES})
     add_perl5_module(libdnf5 ${MODULE_NAME})
 endforeach()

bindings/perl5/libdnf5_cli/CMakeLists.txt

@@ -1,11 +1,11 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 
 
-message("Building bindings for perl5: libdnf_cli")
+message("Building bindings for perl5: libdnf5_cli")
 
 
-foreach(MODULE_NAME ${SWIG_LIBDNF_CLI_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_CLI_MODULES})
     add_perl5_module(libdnf5_cli ${MODULE_NAME})
 endforeach()

bindings/python3/libdnf5/CMakeLists.txt

@@ -1,8 +1,8 @@
-message("Building bindings for python3: libdnf")
+message("Building bindings for python3: libdnf5")
 
 set(INIT_FILE "${CMAKE_CURRENT_BINARY_DIR}/__init__.py")
 file(REMOVE "${INIT_FILE}")
-foreach(MODULE_NAME ${SWIG_LIBDNF_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_MODULES})
     add_python3_module(libdnf5 ${MODULE_NAME})
     file(APPEND "${INIT_FILE}" "from . import ${MODULE_NAME}\n")
 endforeach()

bindings/python3/libdnf5_cli/CMakeLists.txt

@@ -1,13 +1,13 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 
 
-message("Building bindings for python3: libdnf_cli")
+message("Building bindings for python3: libdnf5_cli")
 
 set(INIT_FILE "${CMAKE_CURRENT_BINARY_DIR}/__init__.py")
 file(REMOVE "${INIT_FILE}")
-foreach(MODULE_NAME ${SWIG_LIBDNF_CLI_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_CLI_MODULES})
     add_python3_module(libdnf5_cli ${MODULE_NAME})
     file(APPEND "${INIT_FILE}" "from . import ${MODULE_NAME}\n")
 endforeach()

bindings/ruby/libdnf5/CMakeLists.txt

@@ -1,6 +1,6 @@
-message("Building bindings for ruby: libdnf")
+message("Building bindings for ruby: libdnf5")
 
 
-foreach(MODULE_NAME ${SWIG_LIBDNF_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_MODULES})
     add_ruby_module(libdnf5 ${MODULE_NAME})
 endforeach()

bindings/ruby/libdnf5_cli/CMakeLists.txt

@@ -1,11 +1,11 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 
 
-message("Building bindings for ruby: libdnf_cli")
+message("Building bindings for ruby: libdnf5_cli")
 
 
-foreach(MODULE_NAME ${SWIG_LIBDNF_CLI_MODULES})
+foreach(MODULE_NAME ${SWIG_LIBDNF5_CLI_MODULES})
     add_ruby_module(libdnf5_cli ${MODULE_NAME})
 endforeach()

dnf5.spec

@@ -485,7 +485,7 @@ DNF5 plugins
     \
     -DWITH_DNF5DAEMON_CLIENT=%{?with_dnf5daemon_client:ON}%{!?with_dnf5daemon_client:OFF} \
     -DWITH_DNF5DAEMON_SERVER=%{?with_dnf5daemon_server:ON}%{!?with_dnf5daemon_server:OFF} \
-    -DWITH_LIBDNF_CLI=%{?with_libdnf_cli:ON}%{!?with_libdnf_cli:OFF} \
+    -DWITH_LIBDNF5_CLI=%{?with_libdnf_cli:ON}%{!?with_libdnf_cli:OFF} \
     -DWITH_DNF5=%{?with_dnf5:ON}%{!?with_dnf5:OFF} \
     -DWITH_PLUGIN_ACTIONS=%{?with_plugin_actions:ON}%{!?with_plugin_actions:OFF} \
     -DWITH_PYTHON_PLUGINS_LOADER=%{?with_python_plugins_loader:ON}%{!?with_python_plugins_loader:OFF} \

include/libdnf-cli/CMakeLists.txt

@@ -1,12 +1,12 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 
 
-file(GLOB_RECURSE LIBDNF_CLI_HEADERS *.hpp)
+file(GLOB_RECURSE LIBDNF5_CLI_HEADERS *.hpp)
 
 # preserve relative paths of the header files
-foreach(abspath ${LIBDNF_CLI_HEADERS})
+foreach(abspath ${LIBDNF5_CLI_HEADERS})
     # relative path to the header file
     file(RELATIVE_PATH relpath ${CMAKE_CURRENT_SOURCE_DIR} ${abspath})
     # dirname of the relative path

include/libdnf/CMakeLists.txt

@@ -1,7 +1,7 @@
-file(GLOB_RECURSE LIBDNF_HEADERS *.hpp)
+file(GLOB_RECURSE LIBDNF5_HEADERS *.hpp)
 
 # preserve relative paths of the header files
-foreach(abspath ${LIBDNF_HEADERS})
+foreach(abspath ${LIBDNF5_HEADERS})
     # relative path to the header file
     file(RELATIVE_PATH relpath ${CMAKE_CURRENT_SOURCE_DIR} ${abspath})
     # dirname of the relative path

libdnf-cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 
@@ -7,17 +7,17 @@ add_definitions(-DGETTEXT_DOMAIN=\"libdnf5-cli\")
 
 
 # use any sources found under the current directory
-file(GLOB_RECURSE LIBDNF_CLI_SOURCES *.cpp)
+file(GLOB_RECURSE LIBDNF5_CLI_SOURCES *.cpp)
 
 
 # gather all pkg-config requires and write them to a .pc file later
-list(APPEND LIBDNF_CLI_PC_REQUIRES)
-list(APPEND LIBDNF_CLI_PC_REQUIRES_PRIVATE)
+list(APPEND LIBDNF5_CLI_PC_REQUIRES)
+list(APPEND LIBDNF5_CLI_PC_REQUIRES_PRIVATE)
 
 include_directories(.)
 
 # build libdnf-cli.so
-add_library(libdnf-cli SHARED ${LIBDNF_CLI_SOURCES})
+add_library(libdnf-cli SHARED ${LIBDNF5_CLI_SOURCES})
 set(DNF_CLI_SO_VERSION 0)
 set_target_properties(libdnf-cli PROPERTIES OUTPUT_NAME "dnf-cli")
 set_target_properties(libdnf-cli PROPERTIES SOVERSION ${DNF_CLI_SO_VERSION})
@@ -33,19 +33,19 @@ install(TARGETS libdnf-cli LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
 target_link_libraries(libdnf-cli common libdnf)
 
 pkg_check_modules(LIBFMT REQUIRED fmt)
-list(APPEND LIBDNF_CLI_PC_REQUIRES "${LIBFMT_MODULE_NAME}")
+list(APPEND LIBDNF5_CLI_PC_REQUIRES "${LIBFMT_MODULE_NAME}")
 target_link_libraries(libdnf-cli ${LIBFMT_LIBRARIES})
 
 pkg_check_modules(SMARTCOLS REQUIRED smartcols)
-list(APPEND LIBDNF_CLI_PC_REQUIRES_PRIVATE "${SMARTCOLS_MODULE_NAME}")
+list(APPEND LIBDNF5_CLI_PC_REQUIRES_PRIVATE "${SMARTCOLS_MODULE_NAME}")
 target_link_libraries(libdnf-cli ${SMARTCOLS_LIBRARIES})
 
 
 # sort the pkg-config requires and concatenate them into a string
-list(SORT LIBDNF_CLI_PC_REQUIRES)
-list(JOIN LIBDNF_CLI_PC_REQUIRES ", " LIBDNF_CLI_PC_REQUIRES_STRING)
-list(SORT LIBDNF_CLI_PC_REQUIRES_PRIVATE)
-list(JOIN LIBDNF_CLI_PC_REQUIRES_PRIVATE ", " LIBDNF_CLI_PC_REQUIRES_PRIVATE_STRING)
+list(SORT LIBDNF5_CLI_PC_REQUIRES)
+list(JOIN LIBDNF5_CLI_PC_REQUIRES ", " LIBDNF5_CLI_PC_REQUIRES_STRING)
+list(SORT LIBDNF5_CLI_PC_REQUIRES_PRIVATE)
+list(JOIN LIBDNF5_CLI_PC_REQUIRES_PRIVATE ", " LIBDNF5_CLI_PC_REQUIRES_PRIVATE_STRING)
 
 
 # create a .pc file

libdnf/CMakeLists.txt

@@ -1,12 +1,12 @@
 # use any sources found under the current directory
-file(GLOB_RECURSE LIBDNF_SOURCES *.cpp)
+file(GLOB_RECURSE LIBDNF5_SOURCES *.cpp)
 
 # create config header file
 configure_file("config.h.in" ${CMAKE_CURRENT_SOURCE_DIR}/conf/config.h)
 
 # gather all pkg-config requires and write them to a .pc file later
-list(APPEND LIBDNF_PC_REQUIRES)
-list(APPEND LIBDNF_PC_REQUIRES_PRIVATE)
+list(APPEND LIBDNF5_PC_REQUIRES)
+list(APPEND LIBDNF5_PC_REQUIRES_PRIVATE)
 
 # set gettext domain for translations
 add_definitions(-DGETTEXT_DOMAIN=\"libdnf5\")
@@ -19,7 +19,7 @@ add_definitions(-DLIBSOLV_SOLVABLE_PREPEND_DEP)
 include_directories(.)
 
 # build libdnf.so
-add_library(libdnf SHARED ${LIBDNF_SOURCES})
+add_library(libdnf SHARED ${LIBDNF5_SOURCES})
 set(DNF_SO_VERSION 3)
 set_target_properties(libdnf PROPERTIES OUTPUT_NAME "dnf")
 set_target_properties(libdnf PROPERTIES SOVERSION ${DNF_SO_VERSION})
@@ -43,32 +43,32 @@ target_link_libraries(libdnf common)
 find_package(toml11 REQUIRED)
 
 pkg_check_modules(LIBFMT REQUIRED fmt)
-list(APPEND LIBDNF_PC_REQUIRES "${LIBFMT_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES "${LIBFMT_MODULE_NAME}")
 target_link_libraries(libdnf ${LIBFMT_LIBRARIES})
 
 pkg_check_modules(JSONC REQUIRED json-c)
 include_directories(${JSONC_INCLUDE_DIRS})
 target_link_libraries(libdnf ${JSONC_LIBRARIES})
 
 pkg_check_modules(LIBMODULEMD REQUIRED modulemd-2.0>=2.11.2)
-list(APPEND LIBDNF_PC_REQUIRES "${LIBMODULEMD_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES "${LIBMODULEMD_MODULE_NAME}")
 target_link_libraries(libdnf ${LIBMODULEMD_LIBRARIES})
 
 pkg_check_modules(LIBSOLV REQUIRED libsolv>=0.7.21)
-list(APPEND LIBDNF_PC_REQUIRES "${LIBSOLV_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES "${LIBSOLV_MODULE_NAME}")
 target_link_libraries(libdnf ${LIBSOLV_LIBRARIES})
 
 pkg_check_modules(LIBSOLVEXT REQUIRED libsolvext>=0.7.7)
-list(APPEND LIBDNF_PC_REQUIRES_PRIVATE "${LIBSOLVEXT_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES_PRIVATE "${LIBSOLVEXT_MODULE_NAME}")
 target_link_libraries(libdnf ${LIBSOLVEXT_LIBRARIES})
 
 pkg_check_modules(RPM REQUIRED rpm>=4.17.0)
-list(APPEND LIBDNF_PC_REQUIRES "${RPM_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES "${RPM_MODULE_NAME}")
 target_link_libraries(libdnf ${RPM_LIBRARIES})
 
 if(WITH_COMPS)
     pkg_check_modules(LIBXML2 REQUIRED libxml-2.0)
-    list(APPEND LIBDNF_PC_REQUIRES_PRIVATE "${LIBXML2_MODULE_NAME}")
+    list(APPEND LIBDNF5_PC_REQUIRES_PRIVATE "${LIBXML2_MODULE_NAME}")
     include_directories(${LIBXML2_INCLUDE_DIRS})
     target_link_libraries(libdnf ${LIBXML2_LIBRARIES})
 endif()
@@ -90,24 +90,24 @@ if(NOT GPGME_FOUND)
     set(GPGME_MODULE_NAME gpgme)
     set(GPGME_LIBRARIES gpgme)
 endif()
-list(APPEND LIBDNF_PC_REQUIRES "${GPGME_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES "${GPGME_MODULE_NAME}")
 target_link_libraries(libdnf ${GPGME_LIBRARIES})
 
 pkg_check_modules(LIBREPO REQUIRED librepo>=1.13.0)
-list(APPEND LIBDNF_PC_REQUIRES "${LIBREPO_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES "${LIBREPO_MODULE_NAME}")
 target_link_libraries(libdnf ${LIBREPO_LIBRARIES})
 
 # SQLite3
 pkg_check_modules(SQLite3 REQUIRED sqlite3)
-list(APPEND LIBDNF_PC_REQUIRES "${SQLite3_MODULE_NAME}")
+list(APPEND LIBDNF5_PC_REQUIRES "${SQLite3_MODULE_NAME}")
 target_link_libraries(libdnf ${SQLite3_LIBRARIES})
 
 
 # sort the pkg-config requires and concatenate them into a string
-list(SORT LIBDNF_PC_REQUIRES)
-list(JOIN LIBDNF_PC_REQUIRES ", " LIBDNF_PC_REQUIRES_STRING)
-list(SORT LIBDNF_PC_REQUIRES_PRIVATE)
-list(JOIN LIBDNF_PC_REQUIRES_PRIVATE ", " LIBDNF_PC_REQUIRES_PRIVATE_STRING)
+list(SORT LIBDNF5_PC_REQUIRES)
+list(JOIN LIBDNF5_PC_REQUIRES ", " LIBDNF5_PC_REQUIRES_STRING)
+list(SORT LIBDNF5_PC_REQUIRES_PRIVATE)
+list(JOIN LIBDNF5_PC_REQUIRES_PRIVATE ", " LIBDNF5_PC_REQUIRES_PRIVATE_STRING)
 
 
 # create a .pc file

test/go/libdnf5_cli/CMakeLists.txt

@@ -1,3 +1,3 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()

test/libdnf-cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 
@@ -7,13 +7,13 @@ pkg_check_modules(CPPUNIT REQUIRED cppunit)
 
 
 # use any sources found under the current directory
-file(GLOB_RECURSE TEST_LIBDNF_CLI_SOURCES *.cpp)
+file(GLOB_RECURSE TEST_LIBDNF5_CLI_SOURCES *.cpp)
 
 include_directories(.)
 include_directories(${PROJECT_SOURCE_DIR}/libdnf-cli)
 
 
-add_executable(run_tests_cli ${TEST_LIBDNF_CLI_SOURCES})
+add_executable(run_tests_cli ${TEST_LIBDNF5_CLI_SOURCES})
 target_link_directories(run_tests_cli PUBLIC ${CMAKE_BINARY_DIR}/libdnf)
 target_link_libraries(run_tests_cli stdc++ libdnf libdnf-cli cppunit)
 

test/libdnf/CMakeLists.txt

@@ -2,12 +2,12 @@ pkg_check_modules(CPPUNIT REQUIRED cppunit)
 
 
 # use any sources found under the current directory
-file(GLOB_RECURSE TEST_LIBDNF_SOURCES *.cpp)
+file(GLOB_RECURSE TEST_LIBDNF5_SOURCES *.cpp)
 
 include_directories(.)
 include_directories(${PROJECT_SOURCE_DIR}/libdnf)
 
-add_executable(run_tests ${TEST_LIBDNF_SOURCES})
+add_executable(run_tests ${TEST_LIBDNF5_SOURCES})
 
 # Disable warnings for operations used intentionally to test how the case is handled
 target_compile_options(run_tests PRIVATE "-Wno-unused-comparison")

test/perl5/libdnf5_cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 

test/python3/libdnf5_cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()
 

test/ruby/libdnf5_cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(NOT WITH_LIBDNF_CLI)
+if(NOT WITH_LIBDNF5_CLI)
     return()
 endif()