fix: ubuntu 24 not found
This commit is contained in:
parent
fb80d99cad
commit
ebf8743d78
14
.github/workflows/autobuild.yml
vendored
14
.github/workflows/autobuild.yml
vendored
@ -97,18 +97,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Configure CMake
|
- name: Configure CMake
|
||||||
run: |
|
run: |
|
||||||
$toolchainFile = "${{ steps.vcpkg.outputs.vcpkgToolchainFile }}"
|
|
||||||
|
|
||||||
cmake -B ${{github.workspace}}/build \
|
cmake -B ${{github.workspace}}/build \
|
||||||
-DCMAKE_TOOLCHAIN_FILE=$toolchainFile \
|
-DCMAKE_TOOLCHAIN_FILE={{ steps.vcpkg.outputs.vcpkgToolchainFile }} \
|
||||||
-DVCPKG_TARGET_TRIPLET={{VCPKG_TRIPLET}} \
|
-DVCPKG_TARGET_TRIPLET={{VCPKG_TRIPLET}} \
|
||||||
-S ${{github.workspace}}
|
-S ${{github.workspace}}
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build ${{github.workspace}}/build --config Release
|
run: cmake --build ${{github.workspace}}/build --config Release
|
||||||
|
|
||||||
- name: Upload Windows Artifact
|
- name: Upload Windows Executable Artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: build-artifact-windows
|
name: build-artifact-windows
|
||||||
path: ${{github.workspace}}/build/ncmdump
|
path: ${{github.workspace}}/build/ncmdump.exe
|
||||||
|
|
||||||
|
- name: Upload Windows Library Artifact
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: build-artifact-windows
|
||||||
|
path: ${{github.workspace}}/build/libncmdump.dll
|
@ -1,73 +1,20 @@
|
|||||||
# FindTaglib.cmake
|
# FindTaglib.cmake
|
||||||
#
|
# Try to find TagLib library and headers
|
||||||
# Cross-platform TagLib finder.
|
# Once done, it will define:
|
||||||
# Supports:
|
|
||||||
# - Ubuntu/Debian (libtag1v5-dev)
|
|
||||||
# - macOS (Homebrew)
|
|
||||||
# - Windows (vcpkg/manual)
|
|
||||||
#
|
|
||||||
# Defines:
|
|
||||||
# Taglib_FOUND
|
# Taglib_FOUND
|
||||||
# Taglib_INCLUDE_DIRS
|
# Taglib_INCLUDE_DIRS
|
||||||
# Taglib_LIBRARIES
|
# Taglib_LIBRARIES
|
||||||
# Taglib::Taglib (imported target)
|
# Taglib::Taglib (imported target)
|
||||||
|
|
||||||
# --- First: if official Config file exists (v2.x), use it directly ---
|
|
||||||
find_package(Taglib CONFIG QUIET)
|
|
||||||
if(Taglib_FOUND)
|
|
||||||
message(STATUS "Using system-provided Taglib (with CMake config).")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# --- Manual search fallback (for TagLib v1.x without config) ---
|
|
||||||
message(STATUS "No Taglib CMake config found, falling back to manual search...")
|
|
||||||
|
|
||||||
if(WIN32)
|
|
||||||
# --- Windows ---
|
|
||||||
find_path(Taglib_INCLUDE_DIR tag.h
|
find_path(Taglib_INCLUDE_DIR tag.h
|
||||||
PATH_SUFFIXES taglib
|
PATH_SUFFIXES taglib
|
||||||
PATHS
|
PATHS /usr/include /usr/local/include
|
||||||
"C:/Program Files/taglib/include"
|
|
||||||
"C:/Program Files (x86)/taglib/include"
|
|
||||||
"${CMAKE_SOURCE_DIR}/third_party/taglib/include"
|
|
||||||
)
|
|
||||||
find_library(Taglib_LIBRARY NAMES tag taglib
|
|
||||||
PATHS
|
|
||||||
"C:/Program Files/taglib/lib"
|
|
||||||
"C:/Program Files (x86)/taglib/lib"
|
|
||||||
"${CMAKE_SOURCE_DIR}/third_party/taglib/lib"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
elseif(APPLE)
|
|
||||||
# --- macOS ---
|
|
||||||
find_path(Taglib_INCLUDE_DIR tag.h
|
|
||||||
PATH_SUFFIXES taglib
|
|
||||||
PATHS
|
|
||||||
/usr/local/include
|
|
||||||
/opt/homebrew/include
|
|
||||||
)
|
|
||||||
find_library(Taglib_LIBRARY NAMES tag taglib
|
find_library(Taglib_LIBRARY NAMES tag taglib
|
||||||
PATHS
|
PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu
|
||||||
/usr/local/lib
|
|
||||||
/opt/homebrew/lib
|
|
||||||
)
|
)
|
||||||
|
|
||||||
else()
|
|
||||||
# --- Linux / Unix ---
|
|
||||||
find_path(Taglib_INCLUDE_DIR tag.h
|
|
||||||
PATH_SUFFIXES taglib
|
|
||||||
PATHS
|
|
||||||
/usr/include
|
|
||||||
/usr/local/include
|
|
||||||
)
|
|
||||||
find_library(Taglib_LIBRARY NAMES tag taglib
|
|
||||||
PATHS
|
|
||||||
/usr/lib /usr/lib64
|
|
||||||
/usr/local/lib /usr/local/lib64
|
|
||||||
/usr/lib/x86_64-linux-gnu
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
find_package_handle_standard_args(Taglib DEFAULT_MSG
|
find_package_handle_standard_args(Taglib DEFAULT_MSG
|
||||||
Taglib_LIBRARY Taglib_INCLUDE_DIR
|
Taglib_LIBRARY Taglib_INCLUDE_DIR
|
||||||
@ -84,7 +31,4 @@ if(Taglib_FOUND)
|
|||||||
INTERFACE_INCLUDE_DIRECTORIES ${Taglib_INCLUDE_DIR}
|
INTERFACE_INCLUDE_DIRECTORIES ${Taglib_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
else()
|
|
||||||
message(WARNING "Taglib not found. Please install libtag1v5-dev (Linux), \
|
|
||||||
brew install taglib (macOS), or add manual path (Windows).")
|
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user