TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #310 from probonopd/issue-308

Browse Source 
Issue 308
This commit is contained in:
TheAssassin
2018-07-19 22:13:56 +02:00
committed by GitHub
parent b9b3321202 b1565249a0
commit f16693354d
2 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+30 -22
View File
@@ -7,51 +7,59 @@ project(linuxdeployqt)
find_program(GIT git) find_program(GIT git)
# make sure Git revision ID and latest tag is not stored in the CMake cache
# otherwise, one would have to reset the CMake cache on every new commit to make sure the Git commit ID is up to date
unset(GIT_COMMIT CACHE)
unset(GIT_LATEST_TAG CACHE)
if("${GIT}" STREQUAL "GIT-NOTFOUND") if("${GIT}" STREQUAL "GIT-NOTFOUND")
message(FATAL_ERROR "Could not find git") message(WARNING "Could not find git, commit and tag info cannot be updated")
endif()
# read Git revision ID and latest tag number if(NOT GIT_COMMIT)
execute_process( message(FATAL_ERROR "Commit ID not set, please call with -DGIT_COMMIT=...")
endif()
if(NOT GIT_TAG_NAME)
message(FATAL_ERROR "Tag name not set, please call with -DGIT_TAG_NAME=...")
endif()
else()
# make sure Git revision ID and latest tag is not stored in the CMake cache
# otherwise, one would have to reset the CMake cache on every new commit to make sure the Git commit ID is up to date
unset(GIT_COMMIT CACHE)
unset(GIT_LATEST_TAG CACHE)
# read Git revision ID and latest tag number
execute_process(
COMMAND "${GIT}" rev-parse --short HEAD COMMAND "${GIT}" rev-parse --short HEAD
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_COMMIT OUTPUT_VARIABLE GIT_COMMIT
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE GIT_COMMIT_RESULT RESULT_VARIABLE GIT_COMMIT_RESULT
) )
if(NOT GIT_COMMIT_RESULT EQUAL 0) if(NOT GIT_COMMIT_RESULT EQUAL 0)
message(FATAL_ERROR "Failed to determine git commit ID") message(FATAL_ERROR "Failed to determine git commit ID")
endif() endif()
mark_as_advanced(GIT_COMMIT GIT_COMMIT_RESULT) mark_as_advanced(GIT_COMMIT GIT_COMMIT_RESULT)
execute_process( execute_process(
COMMAND "${GIT}" rev-list --tags --skip=1 --max-count=1 COMMAND "${GIT}" rev-list --tags --skip=1 --max-count=1
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_TAG_ID OUTPUT_VARIABLE GIT_TAG_ID
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE GIT_TAG_ID_RESULT RESULT_VARIABLE GIT_TAG_ID_RESULT
) )
if(NOT GIT_TAG_ID_RESULT EQUAL 0) if(NOT GIT_TAG_ID_RESULT EQUAL 0)
message(FATAL_ERROR "Failed to determine git tag ID") message(FATAL_ERROR "Failed to determine git tag ID")
endif() endif()
mark_as_advanced(GIT_TAG_ID GIT_TAG_ID_RESULT) mark_as_advanced(GIT_TAG_ID GIT_TAG_ID_RESULT)
execute_process( execute_process(
COMMAND "${GIT}" describe --tags ${GIT_TAG_ID} --abbrev=0 COMMAND "${GIT}" describe --tags ${GIT_TAG_ID} --abbrev=0
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE GIT_TAG_NAME OUTPUT_VARIABLE GIT_TAG_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE GIT_TAG_NAME_RESULT RESULT_VARIABLE GIT_TAG_NAME_RESULT
) )
if(NOT GIT_TAG_NAME_RESULT EQUAL 0) if(NOT GIT_TAG_NAME_RESULT EQUAL 0)
message(FATAL_ERROR "Failed to determine git tag name") message(FATAL_ERROR "Failed to determine git tag name")
endif()
mark_as_advanced(GIT_TAG_NAME GIT_TAG_NAME_RESULT)
endif() endif()
mark_as_advanced(GIT_TAG_NAME GIT_TAG_NAME_RESULT)
# set version and build number # set version and build number
set(VERSION 1-alpha) set(VERSION 1-alpha)
tools/linuxdeployqt/excludelist.h
+2
View File
@@ -32,6 +32,7 @@ static const QStringList generatedExcludelist = {
"libgcc_s.so.1", "libgcc_s.so.1",
"libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0.so.0",
"libgio-2.0.so.0", "libgio-2.0.so.0",
"libglapi.so.0",
"libglib-2.0.so.0", "libglib-2.0.so.0",
"libGL.so.1", "libGL.so.1",
"libgobject-2.0.so.0", "libgobject-2.0.so.0",
@@ -59,6 +60,7 @@ static const QStringList generatedExcludelist = {
"librt.so.1", "librt.so.1",
"libSM.so.6", "libSM.so.6",
"libstdc++.so.6", "libstdc++.so.6",
"libthai.so.0",
"libthread_db.so.1", "libthread_db.so.1",
"libusb-1.0.so.0", "libusb-1.0.so.0",
"libutil.so.1", "libutil.so.1",