deps: update zmusic to 1.1.12

This commit is contained in:
alexey.lysiuk 2023-04-02 12:12:21 +03:00
parent 74a63b002d
commit c9490a201b
7 changed files with 91 additions and 75 deletions

View file

@ -9,19 +9,19 @@
# The variable CVF_VERSION must be set before calling configure_file(). # The variable CVF_VERSION must be set before calling configure_file().
set(PACKAGE_VERSION "1.1.11") set(PACKAGE_VERSION "1.1.12")
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()
if("1.1.11" MATCHES "^([0-9]+)\\.") if("1.1.12" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
endif() endif()
else() else()
set(CVF_VERSION_MAJOR "1.1.11") set(CVF_VERSION_MAJOR "1.1.12")
endif() endif()
if(PACKAGE_FIND_VERSION_RANGE) if(PACKAGE_FIND_VERSION_RANGE)

View file

@ -12,8 +12,8 @@ set_target_properties(ZMusic::zmusic PROPERTIES
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libzmusic.a" IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libzmusic.a"
) )
list(APPEND _IMPORT_CHECK_TARGETS ZMusic::zmusic ) list(APPEND _cmake_import_check_targets ZMusic::zmusic )
list(APPEND _IMPORT_CHECK_FILES_FOR_ZMusic::zmusic "${_IMPORT_PREFIX}/lib/libzmusic.a" ) list(APPEND _cmake_import_check_files_for_ZMusic::zmusic "${_IMPORT_PREFIX}/lib/libzmusic.a" )
# Commands beyond this point should not need to know the version. # Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION) set(CMAKE_IMPORT_FILE_VERSION)

View file

@ -1,10 +1,13 @@
# Generated by CMake # Generated by CMake
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
message(FATAL_ERROR "CMake >= 2.6.0 required") message(FATAL_ERROR "CMake >= 2.8.0 required")
endif()
if(CMAKE_VERSION VERSION_LESS "2.8.3")
message(FATAL_ERROR "CMake >= 2.8.3 required")
endif() endif()
cmake_policy(PUSH) cmake_policy(PUSH)
cmake_policy(VERSION 2.6...3.19) cmake_policy(VERSION 2.8.3...3.23)
#---------------------------------------------------------------- #----------------------------------------------------------------
# Generated CMake target import file. # Generated CMake target import file.
#---------------------------------------------------------------- #----------------------------------------------------------------
@ -13,32 +16,34 @@ cmake_policy(VERSION 2.6...3.19)
set(CMAKE_IMPORT_FILE_VERSION 1) set(CMAKE_IMPORT_FILE_VERSION 1)
# Protect against multiple inclusion, which would fail when already imported targets are added once more. # Protect against multiple inclusion, which would fail when already imported targets are added once more.
set(_targetsDefined) set(_cmake_targets_defined "")
set(_targetsNotDefined) set(_cmake_targets_not_defined "")
set(_expectedTargets) set(_cmake_expected_targets "")
foreach(_expectedTarget ZMusic::zmusic) foreach(_cmake_expected_target IN ITEMS ZMusic::zmusic)
list(APPEND _expectedTargets ${_expectedTarget}) list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
if(NOT TARGET ${_expectedTarget}) if(TARGET "${_cmake_expected_target}")
list(APPEND _targetsNotDefined ${_expectedTarget}) list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
endif() else()
if(TARGET ${_expectedTarget}) list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
list(APPEND _targetsDefined ${_expectedTarget})
endif() endif()
endforeach() endforeach()
if("${_targetsDefined}" STREQUAL "${_expectedTargets}") unset(_cmake_expected_target)
unset(_targetsDefined) if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
unset(_targetsNotDefined) unset(_cmake_targets_defined)
unset(_expectedTargets) unset(_cmake_targets_not_defined)
set(CMAKE_IMPORT_FILE_VERSION) unset(_cmake_expected_targets)
unset(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP) cmake_policy(POP)
return() return()
endif() endif()
if(NOT "${_targetsDefined}" STREQUAL "") if(NOT _cmake_targets_defined STREQUAL "")
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
endif() endif()
unset(_targetsDefined) unset(_cmake_targets_defined)
unset(_targetsNotDefined) unset(_cmake_targets_not_defined)
unset(_expectedTargets) unset(_cmake_expected_targets)
# Compute the installation prefix relative to this file. # Compute the installation prefix relative to this file.
@ -64,21 +69,22 @@ if(CMAKE_VERSION VERSION_LESS 2.8.12)
endif() endif()
# Load information for each installed configuration. # Load information for each installed configuration.
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/ZMusicFullTargets-*.cmake")
file(GLOB CONFIG_FILES "${_DIR}/ZMusicFullTargets-*.cmake") foreach(_cmake_config_file IN LISTS _cmake_config_files)
foreach(f ${CONFIG_FILES}) include("${_cmake_config_file}")
include(${f})
endforeach() endforeach()
unset(_cmake_config_file)
unset(_cmake_config_files)
# Cleanup temporary variables. # Cleanup temporary variables.
set(_IMPORT_PREFIX) set(_IMPORT_PREFIX)
# Loop over all imported files and verify that they actually exist # Loop over all imported files and verify that they actually exist
foreach(target ${_IMPORT_CHECK_TARGETS} ) foreach(_cmake_target IN LISTS _cmake_import_check_targets)
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
if(NOT EXISTS "${file}" ) if(NOT EXISTS "${_cmake_file}")
message(FATAL_ERROR "The imported target \"${target}\" references the file message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
\"${file}\" \"${_cmake_file}\"
but this file does not exist. Possible reasons include: but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location. * The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully. * An install or uninstall procedure did not complete successfully.
@ -88,9 +94,11 @@ but not all the files it references.
") ")
endif() endif()
endforeach() endforeach()
unset(_IMPORT_CHECK_FILES_FOR_${target}) unset(_cmake_file)
unset("_cmake_import_check_files_for_${_cmake_target}")
endforeach() endforeach()
unset(_IMPORT_CHECK_TARGETS) unset(_cmake_target)
unset(_cmake_import_check_targets)
# This file does not depend on other imported targets which have # This file does not depend on other imported targets which have
# been exported from the same project but in a separate export set. # been exported from the same project but in a separate export set.

View file

@ -12,8 +12,8 @@ set_target_properties(ZMusic::zmusiclite PROPERTIES
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libzmusiclite.a" IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libzmusiclite.a"
) )
list(APPEND _IMPORT_CHECK_TARGETS ZMusic::zmusiclite ) list(APPEND _cmake_import_check_targets ZMusic::zmusiclite )
list(APPEND _IMPORT_CHECK_FILES_FOR_ZMusic::zmusiclite "${_IMPORT_PREFIX}/lib/libzmusiclite.a" ) list(APPEND _cmake_import_check_files_for_ZMusic::zmusiclite "${_IMPORT_PREFIX}/lib/libzmusiclite.a" )
# Commands beyond this point should not need to know the version. # Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION) set(CMAKE_IMPORT_FILE_VERSION)

View file

@ -1,10 +1,13 @@
# Generated by CMake # Generated by CMake
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
message(FATAL_ERROR "CMake >= 2.6.0 required") message(FATAL_ERROR "CMake >= 2.8.0 required")
endif()
if(CMAKE_VERSION VERSION_LESS "2.8.3")
message(FATAL_ERROR "CMake >= 2.8.3 required")
endif() endif()
cmake_policy(PUSH) cmake_policy(PUSH)
cmake_policy(VERSION 2.6...3.19) cmake_policy(VERSION 2.8.3...3.23)
#---------------------------------------------------------------- #----------------------------------------------------------------
# Generated CMake target import file. # Generated CMake target import file.
#---------------------------------------------------------------- #----------------------------------------------------------------
@ -13,32 +16,34 @@ cmake_policy(VERSION 2.6...3.19)
set(CMAKE_IMPORT_FILE_VERSION 1) set(CMAKE_IMPORT_FILE_VERSION 1)
# Protect against multiple inclusion, which would fail when already imported targets are added once more. # Protect against multiple inclusion, which would fail when already imported targets are added once more.
set(_targetsDefined) set(_cmake_targets_defined "")
set(_targetsNotDefined) set(_cmake_targets_not_defined "")
set(_expectedTargets) set(_cmake_expected_targets "")
foreach(_expectedTarget ZMusic::zmusiclite) foreach(_cmake_expected_target IN ITEMS ZMusic::zmusiclite)
list(APPEND _expectedTargets ${_expectedTarget}) list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
if(NOT TARGET ${_expectedTarget}) if(TARGET "${_cmake_expected_target}")
list(APPEND _targetsNotDefined ${_expectedTarget}) list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
endif() else()
if(TARGET ${_expectedTarget}) list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
list(APPEND _targetsDefined ${_expectedTarget})
endif() endif()
endforeach() endforeach()
if("${_targetsDefined}" STREQUAL "${_expectedTargets}") unset(_cmake_expected_target)
unset(_targetsDefined) if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
unset(_targetsNotDefined) unset(_cmake_targets_defined)
unset(_expectedTargets) unset(_cmake_targets_not_defined)
set(CMAKE_IMPORT_FILE_VERSION) unset(_cmake_expected_targets)
unset(CMAKE_IMPORT_FILE_VERSION)
cmake_policy(POP) cmake_policy(POP)
return() return()
endif() endif()
if(NOT "${_targetsDefined}" STREQUAL "") if(NOT _cmake_targets_defined STREQUAL "")
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
endif() endif()
unset(_targetsDefined) unset(_cmake_targets_defined)
unset(_targetsNotDefined) unset(_cmake_targets_not_defined)
unset(_expectedTargets) unset(_cmake_expected_targets)
# Compute the installation prefix relative to this file. # Compute the installation prefix relative to this file.
@ -64,21 +69,22 @@ if(CMAKE_VERSION VERSION_LESS 2.8.12)
endif() endif()
# Load information for each installed configuration. # Load information for each installed configuration.
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/ZMusicLiteTargets-*.cmake")
file(GLOB CONFIG_FILES "${_DIR}/ZMusicLiteTargets-*.cmake") foreach(_cmake_config_file IN LISTS _cmake_config_files)
foreach(f ${CONFIG_FILES}) include("${_cmake_config_file}")
include(${f})
endforeach() endforeach()
unset(_cmake_config_file)
unset(_cmake_config_files)
# Cleanup temporary variables. # Cleanup temporary variables.
set(_IMPORT_PREFIX) set(_IMPORT_PREFIX)
# Loop over all imported files and verify that they actually exist # Loop over all imported files and verify that they actually exist
foreach(target ${_IMPORT_CHECK_TARGETS} ) foreach(_cmake_target IN LISTS _cmake_import_check_targets)
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
if(NOT EXISTS "${file}" ) if(NOT EXISTS "${_cmake_file}")
message(FATAL_ERROR "The imported target \"${target}\" references the file message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
\"${file}\" \"${_cmake_file}\"
but this file does not exist. Possible reasons include: but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location. * The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully. * An install or uninstall procedure did not complete successfully.
@ -88,9 +94,11 @@ but not all the files it references.
") ")
endif() endif()
endforeach() endforeach()
unset(_IMPORT_CHECK_FILES_FOR_${target}) unset(_cmake_file)
unset("_cmake_import_check_files_for_${_cmake_target}")
endforeach() endforeach()
unset(_IMPORT_CHECK_TARGETS) unset(_cmake_target)
unset(_cmake_import_check_targets)
# This file does not depend on other imported targets which have # This file does not depend on other imported targets which have
# been exported from the same project but in a separate export set. # been exported from the same project but in a separate export set.

Binary file not shown.

Binary file not shown.