mirror of
https://github.com/gamecreature/QtAwesome.git
synced 2025-12-16 19:57:03 +03:00
fixes #72, fix typo in CMakelists.txt, which causes fallback not work
Some checks failed
CMake / macos-14-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.9.0-shared-ON (push) Has been cancelled
Some checks failed
CMake / macos-14-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / macos-14-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / macos-14-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / macos-15-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / macos-15-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-22.04-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / ubuntu-24.04-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / windows-2022-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / windows-2022-Qt-6.9.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-5.12.12-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-5.12.12-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-5.12.2-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-5.12.2-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.6.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.6.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.7.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.7.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.8.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.8.0-shared-ON (push) Has been cancelled
CMake / windows-25-Qt-6.9.0-shared-OFF (push) Has been cancelled
CMake / windows-25-Qt-6.9.0-shared-ON (push) Has been cancelled
This commit is contained in:
@@ -1,10 +1,11 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
#Set The Current Version Number to use as fallback if GIT Fails.
|
#Set The Current Version Number to use as fallback if GIT Fails.
|
||||||
set(QTAWESOME_VERSION_MAJOR 6)
|
set(QTAWESOME_VERSION_MAJOR 7)
|
||||||
set(QTAWESOME_VERSION_MINOR 5)
|
set(QTAWESOME_VERSION_MINOR 0)
|
||||||
set(QTAWESOME_VERSION_PATCH 1)
|
set(QTAWESOME_VERSION_PATCH 0)
|
||||||
set(QTAWESOME_VERSION_TWEAK 0)
|
set(QTAWESOME_VERSION_TWEAK 4)
|
||||||
|
|
||||||
# Get the version from git if it's a git repository
|
# Get the version from git if it's a git repository
|
||||||
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
|
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
|
||||||
find_package(Git)
|
find_package(Git)
|
||||||
@@ -16,7 +17,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
|
|||||||
ERROR_QUIET
|
ERROR_QUIET
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
string(FIND ${GITREV} "font-awesome-" isRev)
|
string(FIND ${GITREV} "font-awesome-" isRev)
|
||||||
if(NOT ifRev EQUAL -1)
|
if(NOT isRev EQUAL -1)
|
||||||
string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
|
string(REGEX MATCH [0-9]+ MAJOR ${GITREV})
|
||||||
string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
|
string(REGEX MATCH \\.[0-9]+ MINOR ${GITREV})
|
||||||
string(REPLACE "." "" MINOR "${MINOR}")
|
string(REPLACE "." "" MINOR "${MINOR}")
|
||||||
|
|||||||
Reference in New Issue
Block a user