Skip to content

Commit ba872e0

Browse files
committed
chore(cmake): Added git definitions
1 parent b3bfd46 commit ba872e0

File tree

3 files changed

+58
-8
lines changed

3 files changed

+58
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ _testmain.go
4040
/qtox.app
4141

4242
# Qt
43-
*.pro.user*
43+
*.user
4444
moc_*
4545
ui_*
4646
qrc_*

CMakeLists.txt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ execute_process(
2222
COMMAND brew --prefix qt5
2323
OUTPUT_VARIABLE QT_PREFIX_PATH
2424
OUTPUT_STRIP_TRAILING_WHITESPACE)
25+
2526
if(NOT QT_PREFIX_PATH)
2627
set(QT_PREFIX_PATH
2728
/usr/src/mxe/usr/x86_64-w64-mingw32.shared/qt5
@@ -115,11 +116,23 @@ qt5_add_translation(${PROJECT_NAME}_QM_FILES
115116
translations/zh.ts
116117
)
117118

118-
qt5_add_resources(${PROJECT_NAME}_RESOURCES
119+
qt5_add_resources(
120+
${PROJECT_NAME}_RESOURCES
119121
res.qrc
120-
smileys/smileys.qrc
121122
${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
122-
DEPENDS ${${PROJECT_NAME}_QM_FILES})
123+
DEPENDS ${${PROJECT_NAME}_QM_FILES}
124+
)
125+
126+
if(NOT ${SMILEYS})
127+
set(SMILEYS, "")
128+
endif()
129+
130+
if(NOT ${SMILEYS} MATCHES "NO")
131+
qt5_add_resources(smileys/emojione.qrc)
132+
if(NOT ${SMILEYS} MATCHES "MIN")
133+
qt5_add_resources(smileys/smileys.qrc)
134+
endif()
135+
endif()
123136

124137
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/translations.qrc.in"
125138
"<!DOCTYPE RCC>

cmake/Dependencies.cmake

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,46 @@ if(WIN32)
111111
search_dependency(STRMIIDS LIBRARY strmiids)
112112
endif()
113113

114+
execute_process(
115+
COMMAND git describe --tags
116+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
117+
OUTPUT_VARIABLE GIT_DESCRIBE
118+
ERROR_QUIET
119+
OUTPUT_STRIP_TRAILING_WHITESPACE
120+
)
121+
122+
if(NOT GIT_DESCRIBE)
123+
set(GIT_DESCRIBE "Nightly")
124+
endif()
125+
126+
add_definitions(
127+
-DGIT_DESCRIBE="${GIT_DESCRIBE}"
128+
)
129+
130+
# GIT_VERSION
131+
execute_process(
132+
COMMAND git rev-parse HEAD
133+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
134+
OUTPUT_VARIABLE GIT_VERSION
135+
ERROR_QUIET
136+
OUTPUT_STRIP_TRAILING_WHITESPACE
137+
)
138+
139+
if(NOT GIT_VERSION)
140+
set(GIT_VERSION "build without git")
141+
endif()
142+
143+
add_definitions(
144+
-DGIT_VERSION="${GIT_VERSION}"
145+
)
146+
147+
execute_process(
148+
COMMAND date +%s
149+
OUTPUT_VARIABLE TIMESTAMP
150+
)
151+
114152
add_definitions(
153+
-DTIMESTAMP=${TIMESTAMP}
154+
-DLOG_TO_FILE=1
115155
-DQTOX_PLATFORM_EXT=1
116-
-DGIT_COMMIT="N/A"
117-
-DGIT_DESCRIBE="N/A"
118-
-DGIT_VERSION="N/A"
119-
-DTIMESTAMP="N/A")
156+
)

0 commit comments

Comments
 (0)