File tree Expand file tree Collapse file tree 5 files changed +21
-22
lines changed Expand file tree Collapse file tree 5 files changed +21
-22
lines changed Original file line number Diff line number Diff line change 1
1
cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
2
2
project (OpenHantek)
3
3
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
+
4
20
set (OpenGL_GL_PREFERENCE GLVND)
5
21
6
22
set (CMAKE_EXPORT_COMPILE_COMMANDS ON )
@@ -17,16 +33,6 @@ INCLUDE_DIRECTORIES(".")
17
33
18
34
find_package (Git)
19
35
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
-
30
36
add_compile_options (-Wall -Wextra -pedantic)
31
37
32
38
# Silence nasty warnings "parameter passing for argument of type ... changed in GCC 7.1"
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 48
48
<file>images/darktheme/settings.svg</file>
49
49
<file>images/darktheme/terminal.svg</file>
50
50
</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>
51
56
</RCC>
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments