Skip to content

Commit 6b56dad

Browse files
committed
remove font awesome files; refactor res; refactor cmake
Signed-off-by: Martin <[email protected]>
1 parent 1b419e3 commit 6b56dad

File tree

5 files changed

+21
-22
lines changed

5 files changed

+21
-22
lines changed

CMakeLists.txt

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22
project(OpenHantek)
33

4+
if (GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
5+
# show modified files
6+
execute_process(
7+
COMMAND ${GIT_EXECUTABLE} status --short
8+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
9+
)
10+
# get the git version
11+
execute_process(
12+
COMMAND ${GIT_EXECUTABLE} describe --tags
13+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
14+
OUTPUT_VARIABLE VERSION
15+
OUTPUT_STRIP_TRAILING_WHITESPACE
16+
)
17+
message(STATUS "VERSION: ${VERSION}")
18+
endif()
19+
420
set(OpenGL_GL_PREFERENCE GLVND)
521

622
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -17,16 +33,6 @@ INCLUDE_DIRECTORIES(".")
1733

1834
find_package(Git)
1935

20-
if (GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
21-
execute_process(
22-
COMMAND ${GIT_EXECUTABLE} describe --tags
23-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
24-
OUTPUT_VARIABLE VERSION
25-
OUTPUT_STRIP_TRAILING_WHITESPACE
26-
)
27-
endif()
28-
message(STATUS "VERSION: ${VERSION}")
29-
3036
add_compile_options(-Wall -Wextra -pedantic)
3137

3238
# Silence nasty warnings "parameter passing for argument of type ... changed in GCC 7.1"

openhantek/res/QtAwesomeFree.qrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

openhantek/res/application.qrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,9 @@
4848
<file>images/darktheme/settings.svg</file>
4949
<file>images/darktheme/terminal.svg</file>
5050
</qresource>
51+
<qresource prefix="/config">
52+
<file alias="spectrum.png">images/config/spectrum.png</file>
53+
<file alias="scope.png">images/config/scope.png</file>
54+
<file alias="colors.png">images/config/colors.png</file>
55+
</qresource>
5156
</RCC>

openhantek/res/configdialog.qrc

Lines changed: 0 additions & 7 deletions
This file was deleted.
-162 KB
Binary file not shown.

0 commit comments

Comments
 (0)