From b0f27996085ff12449d149a79305adab4484665c Mon Sep 17 00:00:00 2001 From: Nicola Sella Date: Wed, 17 Aug 2022 15:01:47 +0200 Subject: [PATCH] Rename LIBDNF/LIBDNF5 in Cmake files --- CMakeLists.txt | 10 +++--- bindings/CMakeLists.txt | 4 +-- bindings/go/libdnf5/CMakeLists.txt | 4 +-- bindings/go/libdnf5_cli/CMakeLists.txt | 6 ++-- bindings/perl5/libdnf5/CMakeLists.txt | 4 +-- bindings/perl5/libdnf5_cli/CMakeLists.txt | 6 ++-- bindings/python3/libdnf5/CMakeLists.txt | 4 +-- bindings/python3/libdnf5_cli/CMakeLists.txt | 6 ++-- bindings/ruby/libdnf5/CMakeLists.txt | 4 +-- bindings/ruby/libdnf5_cli/CMakeLists.txt | 6 ++-- dnf5.spec | 2 +- include/libdnf-cli/CMakeLists.txt | 6 ++-- include/libdnf/CMakeLists.txt | 4 +-- libdnf-cli/CMakeLists.txt | 22 ++++++------- libdnf/CMakeLists.txt | 34 ++++++++++----------- test/go/libdnf5_cli/CMakeLists.txt | 2 +- test/libdnf-cli/CMakeLists.txt | 6 ++-- test/libdnf/CMakeLists.txt | 4 +-- test/perl5/libdnf5_cli/CMakeLists.txt | 2 +- test/python3/libdnf5_cli/CMakeLists.txt | 2 +- test/ruby/libdnf5_cli/CMakeLists.txt | 2 +- 21 files changed, 70 insertions(+), 70 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 777835cf5..963307d26 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index 2b0b25b08..e35046c33 100644 --- a/bindings/CMakeLists.txt +++ b/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) diff --git a/bindings/go/libdnf5/CMakeLists.txt b/bindings/go/libdnf5/CMakeLists.txt index 22ebdcbbb..6ea6243d5 100644 --- a/bindings/go/libdnf5/CMakeLists.txt +++ b/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() diff --git a/bindings/go/libdnf5_cli/CMakeLists.txt b/bindings/go/libdnf5_cli/CMakeLists.txt index 72041193e..4b2e56f2a 100644 --- a/bindings/go/libdnf5_cli/CMakeLists.txt +++ b/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() diff --git a/bindings/perl5/libdnf5/CMakeLists.txt b/bindings/perl5/libdnf5/CMakeLists.txt index a3e4c8dc8..d25925a8e 100644 --- a/bindings/perl5/libdnf5/CMakeLists.txt +++ b/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() diff --git a/bindings/perl5/libdnf5_cli/CMakeLists.txt b/bindings/perl5/libdnf5_cli/CMakeLists.txt index dfb63a9d9..05ac86f4e 100644 --- a/bindings/perl5/libdnf5_cli/CMakeLists.txt +++ b/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() diff --git a/bindings/python3/libdnf5/CMakeLists.txt b/bindings/python3/libdnf5/CMakeLists.txt index 6ab3fe430..5bc0750af 100644 --- a/bindings/python3/libdnf5/CMakeLists.txt +++ b/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() diff --git a/bindings/python3/libdnf5_cli/CMakeLists.txt b/bindings/python3/libdnf5_cli/CMakeLists.txt index 1c54395c2..8070b9af9 100644 --- a/bindings/python3/libdnf5_cli/CMakeLists.txt +++ b/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() diff --git a/bindings/ruby/libdnf5/CMakeLists.txt b/bindings/ruby/libdnf5/CMakeLists.txt index cd1d3fc32..d42fabf3e 100644 --- a/bindings/ruby/libdnf5/CMakeLists.txt +++ b/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() diff --git a/bindings/ruby/libdnf5_cli/CMakeLists.txt b/bindings/ruby/libdnf5_cli/CMakeLists.txt index d3fdc040f..88410b8b5 100644 --- a/bindings/ruby/libdnf5_cli/CMakeLists.txt +++ b/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() diff --git a/dnf5.spec b/dnf5.spec index 15d373461..24c768284 100644 --- a/dnf5.spec +++ b/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} \ diff --git a/include/libdnf-cli/CMakeLists.txt b/include/libdnf-cli/CMakeLists.txt index 06faef39a..7af86aa2a 100644 --- a/include/libdnf-cli/CMakeLists.txt +++ b/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 diff --git a/include/libdnf/CMakeLists.txt b/include/libdnf/CMakeLists.txt index 1dfb87023..ce2130915 100644 --- a/include/libdnf/CMakeLists.txt +++ b/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 diff --git a/libdnf-cli/CMakeLists.txt b/libdnf-cli/CMakeLists.txt index aaf5c66ee..a27d82be2 100644 --- a/libdnf-cli/CMakeLists.txt +++ b/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 diff --git a/libdnf/CMakeLists.txt b/libdnf/CMakeLists.txt index 1332aa938..47dca2b6b 100644 --- a/libdnf/CMakeLists.txt +++ b/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,7 +43,7 @@ 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) @@ -51,24 +51,24 @@ 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 diff --git a/test/go/libdnf5_cli/CMakeLists.txt b/test/go/libdnf5_cli/CMakeLists.txt index cc2260dd7..ff196ada4 100644 --- a/test/go/libdnf5_cli/CMakeLists.txt +++ b/test/go/libdnf5_cli/CMakeLists.txt @@ -1,3 +1,3 @@ -if(NOT WITH_LIBDNF_CLI) +if(NOT WITH_LIBDNF5_CLI) return() endif() diff --git a/test/libdnf-cli/CMakeLists.txt b/test/libdnf-cli/CMakeLists.txt index 5c7c4d222..d43a5e17a 100644 --- a/test/libdnf-cli/CMakeLists.txt +++ b/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) diff --git a/test/libdnf/CMakeLists.txt b/test/libdnf/CMakeLists.txt index 9e53bf5f1..59b394959 100644 --- a/test/libdnf/CMakeLists.txt +++ b/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") diff --git a/test/perl5/libdnf5_cli/CMakeLists.txt b/test/perl5/libdnf5_cli/CMakeLists.txt index 6b1ccc66a..9bf7b3915 100644 --- a/test/perl5/libdnf5_cli/CMakeLists.txt +++ b/test/perl5/libdnf5_cli/CMakeLists.txt @@ -1,4 +1,4 @@ -if(NOT WITH_LIBDNF_CLI) +if(NOT WITH_LIBDNF5_CLI) return() endif() diff --git a/test/python3/libdnf5_cli/CMakeLists.txt b/test/python3/libdnf5_cli/CMakeLists.txt index 72c5a6405..f1dd3f89f 100644 --- a/test/python3/libdnf5_cli/CMakeLists.txt +++ b/test/python3/libdnf5_cli/CMakeLists.txt @@ -1,4 +1,4 @@ -if(NOT WITH_LIBDNF_CLI) +if(NOT WITH_LIBDNF5_CLI) return() endif() diff --git a/test/ruby/libdnf5_cli/CMakeLists.txt b/test/ruby/libdnf5_cli/CMakeLists.txt index 19eda9758..2846b84a7 100644 --- a/test/ruby/libdnf5_cli/CMakeLists.txt +++ b/test/ruby/libdnf5_cli/CMakeLists.txt @@ -1,4 +1,4 @@ -if(NOT WITH_LIBDNF_CLI) +if(NOT WITH_LIBDNF5_CLI) return() endif()