diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2a5907d..fd6de57 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -45,9 +45,6 @@ jobs: git clone -q https://invent.kde.org/frameworks/kcodecs.git dependencies_src/kcodecs cmake .\dependencies_src\kcodecs -Bbuild_dependencies/kcodecs -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error cmake --build build_dependencies/kcodecs --config Release --target=install || goto :error - :: ===== pkg-config ===== - choco install pkgconfiglite - set PKG_CONFIG_PATH=%PWD%/dependencies_bin/lib/pkgconfig :: ===== taglib ===== git clone --recurse-submodules -q https://github.com/taglib/taglib.git dependencies_src/taglib cmake .\dependencies_src\taglib -Bbuild_dependencies/taglib -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e1bcd9..79ed581 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,17 +17,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) option(USE_QTEXTCODEC "Use QTextCodec instead of QStringConverter, in case Qt is not built with ICU" OFF) find_package(Qt6 6.6 COMPONENTS Widgets Multimedia Network LinguistTools REQUIRED) +find_package(TagLib 2.0.0) find_package(KF6Codecs 6.1.0) -find_package(PkgConfig) if (USE_QTEXTCODEC) find_package(Qt6 6.6 COMPONENTS Core5Compat REQUIRED) endif() -if (PKG_CONFIG_FOUND) -pkg_check_modules(TagLib taglib IMPORTED_TARGET) -endif () - set (PMUSIC_CPP_FILES main.cpp mainwindow.cpp @@ -76,7 +72,7 @@ endif () if (NOT TagLib_FOUND) target_compile_definitions(${EXE_NAME} PRIVATE NO_TAGLIB=1) else () - target_link_libraries(${EXE_NAME} PRIVATE PkgConfig::TagLib) + target_link_libraries(${EXE_NAME} PRIVATE TagLib::tag) endif () if (TARGET KF6::Codecs) diff --git a/appveyor.yml b/appveyor.yml index cf94d9d..e51bf20 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,6 @@ image: environment: CMAKE_INSTALL_ROOT: C:\projects\cmake PACKAGE_INSTALL_ROOT: C:\projects\pir - PKG_CONFIG_PATH: C:\projects\pir\lib\pkgconfig matrix: - build_name: mingw1120_64_qt6_7 QTPATH: C:\Qt\6.7\mingw_64 @@ -23,7 +22,6 @@ build_script: - mkdir 3rdparty - choco install ninja - choco install gperf - - choco install pkgconfiglite - cd 3rdparty # install ECM - git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git