Wed, 25 May 2022 20:36:34 +0300
Fix pick() picking from weird places on the screen with high DPI scaling
glReadPixels reads data from the frame buffer, which contains data after
high DPI scaling, so any reads to that need to take this scaling into account
| 0 | 1 | project(ldforge) | 
| 2 | cmake_minimum_required(VERSION 2.8.12) | |
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
3 | set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") | 
| 
99
 
05ce5a34c497
disable cotire because it's messing up Qt Creator's Clang code model for me
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
98 
diff
changeset
 | 
4 | #include(cotire) | 
| 21 | 5 | set(OpenGL_GL_PREFERENCE GLVND) | 
| 0 | 6 | find_package(Qt5Widgets REQUIRED) | 
| 6 | 7 | if (Qt5Widgets_VERSION VERSION_LESS 5.5.0) | 
| 8 | message(FATAL_ERROR "Qt5 version 5.5 required") | |
| 9 | endif() | |
| 0 | 10 | find_package(Qt5Core REQUIRED) | 
| 11 | find_package(Qt5OpenGL REQUIRED) | |
| 12 | find_package(Qt5Network REQUIRED) | |
| 
105
 
6ca6e8c647d4
added preview layer code and fixed build warnings
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
104 
diff
changeset
 | 
13 | #find_package(Qt5LinguistTools REQUIRED) | 
| 28 | 14 | find_package(GLM REQUIRED) | 
| 15 | set(CMAKE_AUTOMOC ON) | |
| 16 | set(CMAKE_AUTOUIC ON) | |
| 17 | set(CMAKE_AUTORCC ON) | |
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
18 | find_package(OpenGL REQUIRED) | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
19 | include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) | 
| 28 | 20 | include_directories(${GLM_INCLUDE_DIR}) | 
| 112 | 21 | add_definitions(-DQT_NO_KEYWORDS) | 
| 
191
 
d355d4c52d51
made editing tools not a polymorphic class tree
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
186 
diff
changeset
 | 
22 | source_group("LDForge" REGULAR_EXPRESSION "src/.+\\.(cpp|h|ui)") | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
23 | |
| 0 | 24 | set (LDFORGE_SOURCES | 
| 26 | 25 | src/colors.cpp | 
| 
8
 
44679e468ba9
major update with many things
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
7 
diff
changeset
 | 
26 | src/document.cpp | 
| 3 | 27 | src/documentmanager.cpp | 
| 
133
 
e39326ee48dc
Begin work on edit history
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
127 
diff
changeset
 | 
28 | src/edithistory.cpp | 
| 55 | 29 | src/geometry.cpp | 
| 140 | 30 | src/header.cpp | 
| 152 | 31 | src/ldrawalgorithm.cpp | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
32 | src/libraries.cpp | 
| 17 | 33 | src/invert.cpp | 
| 0 | 34 | src/main.cpp | 
| 1 | 35 | src/mainwindow.cpp | 
| 3 | 36 | src/model.cpp | 
| 
153
 
2f79053c2e9a
Renamed modeleditcontext.cpp -> modeleditor.cpp
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
152 
diff
changeset
 | 
37 | src/modeleditor.cpp | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
38 | src/parser.cpp | 
| 
150
 
b6cbba6e29a1
extract polygon cache out of Model
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
148 
diff
changeset
 | 
39 | src/polygoncache.cpp | 
| 16 | 40 | src/uiutilities.cpp | 
| 1 | 41 | src/version.cpp | 
| 117 | 42 | src/vertexmap.cpp | 
| 
69
 
a36913fc552a
begin work on axes program
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
63 
diff
changeset
 | 
43 | src/gl/axesprogram.cpp | 
| 70 | 44 | src/gl/basicshaderprogram.cpp | 
| 17 | 45 | src/gl/compiler.cpp | 
| 53 | 46 | src/gl/gridprogram.cpp | 
| 17 | 47 | src/gl/partrenderer.cpp | 
| 118 | 48 | src/gl/vertexprogram.cpp | 
| 186 | 49 | src/linetypes/circularprimitive.cpp | 
| 
183
 
97b591813c8b
- Add editors for string and bool properties
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
182 
diff
changeset
 | 
50 | src/linetypes/compoundobject.cpp | 
| 14 | 51 | src/linetypes/conditionaledge.cpp | 
| 52 | src/linetypes/edge.cpp | |
| 53 | src/linetypes/errorline.cpp | |
| 54 | src/linetypes/metacommand.cpp | |
| 55 | src/linetypes/object.cpp | |
| 
15
 
9e18ec63eec3
split quadrilateral and triangle into their own source files
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
14 
diff
changeset
 | 
56 | src/linetypes/quadrilateral.cpp | 
| 14 | 57 | src/linetypes/subfilereference.cpp | 
| 
15
 
9e18ec63eec3
split quadrilateral and triangle into their own source files
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
14 
diff
changeset
 | 
58 | src/linetypes/triangle.cpp | 
| 16 | 59 | src/settingseditor/keyboardshortcutseditor.cpp | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
60 | src/settingseditor/librarieseditor.cpp | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
61 | src/settingseditor/settingseditor.cpp | 
| 17 | 62 | src/types/boundingbox.cpp | 
| 47 | 63 | src/ui/canvas.cpp | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
64 | src/ui/multiplyfactordialog.cpp | 
| 
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
65 | src/ui/objecteditor.cpp | 
| 
39
 
caac957e9834
Main color is now configurable
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
33 
diff
changeset
 | 
66 | src/widgets/colorbutton.cpp | 
| 178 | 67 | src/widgets/colorindexinput.cpp | 
| 
94
 
164f53fb5921
added a color select dialog
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
92 
diff
changeset
 | 
68 | src/widgets/colorselectdialog.cpp | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
69 | src/widgets/doublespinbox.cpp | 
| 
85
 
40e2940605a3
added a matrix editing widget
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
81 
diff
changeset
 | 
70 | src/widgets/matrixeditor.cpp | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
71 | src/widgets/vec3editor.cpp | 
| 0 | 72 | ) | 
| 73 | set (LDFORGE_HEADERS | |
| 3 | 74 | src/basics.h | 
| 75 | src/colors.h | |
| 
8
 
44679e468ba9
major update with many things
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
7 
diff
changeset
 | 
76 | src/document.h | 
| 3 | 77 | src/documentmanager.h | 
| 
133
 
e39326ee48dc
Begin work on edit history
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
127 
diff
changeset
 | 
78 | src/edithistory.h | 
| 
63
 
f7dd937667a5
omg functional programming
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
55 
diff
changeset
 | 
79 | src/functional.h | 
| 55 | 80 | src/geometry.h | 
| 21 | 81 | src/header.h | 
| 17 | 82 | src/invert.h | 
| 152 | 83 | src/ldrawalgorithm.h | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
84 | src/libraries.h | 
| 0 | 85 | src/main.h | 
| 1 | 86 | src/mainwindow.h | 
| 3 | 87 | src/model.h | 
| 
153
 
2f79053c2e9a
Renamed modeleditcontext.cpp -> modeleditor.cpp
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
152 
diff
changeset
 | 
88 | src/modeleditor.h | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
89 | src/parser.h | 
| 
150
 
b6cbba6e29a1
extract polygon cache out of Model
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
148 
diff
changeset
 | 
90 | src/polygoncache.h | 
| 17 | 91 | src/ring.h | 
| 16 | 92 | src/uiutilities.h | 
| 
8
 
44679e468ba9
major update with many things
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
7 
diff
changeset
 | 
93 | src/utility.h | 
| 1 | 94 | src/version.h | 
| 117 | 95 | src/vertexmap.h | 
| 
69
 
a36913fc552a
begin work on axes program
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
63 
diff
changeset
 | 
96 | src/gl/axesprogram.h | 
| 70 | 97 | src/gl/basicshaderprogram.h | 
| 17 | 98 | src/gl/common.h | 
| 99 | src/gl/compiler.h | |
| 53 | 100 | src/gl/gridprogram.h | 
| 17 | 101 | src/gl/partrenderer.h | 
| 118 | 102 | src/gl/vertexprogram.h | 
| 186 | 103 | src/linetypes/circularprimitive.h | 
| 
183
 
97b591813c8b
- Add editors for string and bool properties
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
182 
diff
changeset
 | 
104 | src/linetypes/compoundobject.h | 
| 14 | 105 | src/linetypes/conditionaledge.h | 
| 106 | src/linetypes/edge.h | |
| 107 | src/linetypes/errorline.h | |
| 108 | src/linetypes/metacommand.h | |
| 109 | src/linetypes/object.h | |
| 89 | 110 | src/linetypes/polygonobject.h | 
| 111 | src/linetypes/propertygenerics.h | |
| 
15
 
9e18ec63eec3
split quadrilateral and triangle into their own source files
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
14 
diff
changeset
 | 
112 | src/linetypes/quadrilateral.h | 
| 14 | 113 | src/linetypes/subfilereference.h | 
| 
15
 
9e18ec63eec3
split quadrilateral and triangle into their own source files
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
14 
diff
changeset
 | 
114 | src/linetypes/triangle.h | 
| 16 | 115 | src/settingseditor/keyboardshortcutseditor.h | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
116 | src/settingseditor/librarieseditor.h | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
117 | src/settingseditor/settingseditor.h | 
| 17 | 118 | src/types/boundingbox.h | 
| 47 | 119 | src/ui/canvas.h | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
120 | src/ui/multiplyfactordialog.h | 
| 
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
121 | src/ui/objecteditor.h | 
| 
39
 
caac957e9834
Main color is now configurable
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
33 
diff
changeset
 | 
122 | src/widgets/colorbutton.h | 
| 178 | 123 | src/widgets/colorindexinput.h | 
| 
94
 
164f53fb5921
added a color select dialog
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
92 
diff
changeset
 | 
124 | src/widgets/colorselectdialog.h | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
125 | src/widgets/doublespinbox.h | 
| 
85
 
40e2940605a3
added a matrix editing widget
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
81 
diff
changeset
 | 
126 | src/widgets/matrixeditor.h | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
127 | src/widgets/vec3editor.h | 
| 0 | 128 | ) | 
| 129 | set (LDFORGE_FORMS | |
| 
8
 
44679e468ba9
major update with many things
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
7 
diff
changeset
 | 
130 | src/document.ui | 
| 1 | 131 | src/mainwindow.ui | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
132 | src/settingseditor/librarieseditor.ui | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
133 | src/settingseditor/settingseditor.ui | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
134 | src/ui/multiplyfactordialog.ui | 
| 
182
 
27fb1c3c9fbb
add ui file to object editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
180 
diff
changeset
 | 
135 | src/ui/objecteditor.ui | 
| 
94
 
164f53fb5921
added a color select dialog
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
92 
diff
changeset
 | 
136 | src/widgets/colorselectdialog.ui | 
| 178 | 137 | src/widgets/colorindexinput.ui | 
| 
85
 
40e2940605a3
added a matrix editing widget
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
81 
diff
changeset
 | 
138 | src/widgets/matrixeditor.ui | 
| 
81
 
62373840e33a
object editor widgets start to form up
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
70 
diff
changeset
 | 
139 | src/widgets/vec3editor.ui | 
| 0 | 140 | ) | 
| 6 | 141 | |
| 142 | set(LDFORGE_LOCALES | |
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
143 | locale/fi.ts | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
144 | locale/sv.ts | 
| 6 | 145 | ) | 
| 146 | ||
| 
42
 
1d03dc1173cd
made configurationoptions.txt visible in Qt Creator
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
41 
diff
changeset
 | 
147 | set (LDFORGE_OTHER_FILES | 
| 
 
1d03dc1173cd
made configurationoptions.txt visible in Qt Creator
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
41 
diff
changeset
 | 
148 | src/configurationoptions.txt | 
| 
 
1d03dc1173cd
made configurationoptions.txt visible in Qt Creator
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
41 
diff
changeset
 | 
149 | ) | 
| 
 
1d03dc1173cd
made configurationoptions.txt visible in Qt Creator
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
41 
diff
changeset
 | 
150 | |
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
151 | set(LDFORGE_RESOURCES ldforge.qrc) | 
| 148 | 152 | set(CMAKE_CXX_STANDARD 20) | 
| 
39
 
caac957e9834
Main color is now configurable
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
33 
diff
changeset
 | 
153 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | 
| 
 
caac957e9834
Main color is now configurable
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
33 
diff
changeset
 | 
154 | set(CMAKE_CXX_EXTENSIONS OFF) | 
| 
 
caac957e9834
Main color is now configurable
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
33 
diff
changeset
 | 
155 | include_directories("${PROJECT_BINARY_DIR}") | 
| 
 
caac957e9834
Main color is now configurable
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
33 
diff
changeset
 | 
156 | include_directories("${PROJECT_BINARY_DIR}/src") | 
| 
 
caac957e9834
Main color is now configurable
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
33 
diff
changeset
 | 
157 | include_directories("${PROJECT_SOURCE_DIR}/src") | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
158 | |
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
159 | # Translations | 
| 104 | 160 | #qt5_create_translation(QM_FILES ${LDFORGE_SOURCES} ${LDFORGE_HEADERS} ${LDFORGE_FORMS} ${LDFORGE_LOCALES}) | 
| 161 | #add_custom_target(translations ALL DEPENDS ${QM_FILES}) | |
| 
10
 
e249d97c7fe6
fixed translations being updated twice at the same time, that's bad
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
8 
diff
changeset
 | 
162 | add_custom_target(resources ALL DEPENDS ${LDFORGE_RESOURCES}) | 
| 6 | 163 | |
| 0 | 164 | if (NOT MSVC) | 
| 165 | if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") | |
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
166 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG") | 
| 0 | 167 | endif() | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
168 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
169 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-fallthrough") | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
170 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") | 
| 0 | 171 | endif() | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
172 | qt5_add_resources(LDFORGE_QRC ${LDFORGE_RESOURCES}) | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
173 | qt5_wrap_ui(LDFORGE_FORMS_HEADERS ${LDFORGE_FORMS}) | 
| 6 | 174 | |
| 175 | # Move languages.qrc into the build directory to bake the .qm-files into LDForge | |
| 176 | # so that they don't have to be shipped separately | |
| 177 | # https://stackoverflow.com/a/34798124 | |
| 
10
 
e249d97c7fe6
fixed translations being updated twice at the same time, that's bad
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
8 
diff
changeset
 | 
178 | # https://gist.github.com/giraldeau/546ba5512a74dfe9d8ea0862d66db412 | 
| 6 | 179 | set(LANGUAGES_QRC "languages.qrc") | 
| 
10
 
e249d97c7fe6
fixed translations being updated twice at the same time, that's bad
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
8 
diff
changeset
 | 
180 | configure_file(${LANGUAGES_QRC} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) | 
| 6 | 181 | qt5_add_resources(LDFORGE_QM_RC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${LANGUAGES_QRC}) | 
| 28 | 182 | set_source_files_properties(${LDFORGE_LOCALES} PROPERTIES HEADER_FILE_ONLY TRUE) | 
| 6 | 183 | |
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
184 | add_executable(ldforge WIN32 | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
185 | ${LDFORGE_SOURCES} | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
186 | ${LDFORGE_HEADERS} | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
187 | ${LDFORGE_RESOURCES} | 
| 
158
 
5bd755eaa5a8
Add icons from ionicons
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
153 
diff
changeset
 | 
188 | ${LDFORGE_QRC} | 
| 104 | 189 | #${LDFORGE_QM_RC_FILE} | 
| 28 | 190 | ${QM_FILES} | 
| 0 | 191 | ${LDFORGE_FORMS_HEADERS} | 
| 
42
 
1d03dc1173cd
made configurationoptions.txt visible in Qt Creator
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
41 
diff
changeset
 | 
192 | ${LDFORGE_OTHER_FILES} | 
| 
41
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
193 | ${CMAKE_BINARY_DIR}/configuration.cpp | 
| 0 | 194 | ) | 
| 6 | 195 | |
| 0 | 196 | set_source_files_properties(${LDFORGE_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE) | 
| 6 | 197 | set_source_files_properties(${LDFORGE_RESOURCES} PROPERTIES HEADER_FILE_ONLY TRUE) | 
| 
42
 
1d03dc1173cd
made configurationoptions.txt visible in Qt Creator
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
41 
diff
changeset
 | 
198 | set_source_files_properties(${LDFORGE_OTHER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) | 
| 0 | 199 | set_target_properties(ldforge PROPERTIES AUTOMOC 1) | 
| 200 | target_link_libraries(ldforge Qt5::Widgets Qt5::Network Qt5::OpenGL ${OPENGL_LIBRARIES}) | |
| 100 | 201 | add_dependencies(ldforge resources) | 
| 
99
 
05ce5a34c497
disable cotire because it's messing up Qt Creator's Clang code model for me
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
98 
diff
changeset
 | 
202 | #cotire(ldforge) | 
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
203 | |
| 
41
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
204 | add_custom_target (config_collection ALL | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
205 | COMMAND python3 | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
206 | "${CMAKE_SOURCE_DIR}/tools/configcollector.py" | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
207 | --header ${CMAKE_BINARY_DIR}/configuration.h | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
208 | --source ${CMAKE_BINARY_DIR}/configuration.cpp | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
209 | --sourcedir ${CMAKE_SOURCE_DIR}/src | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
210 | ${CMAKE_SOURCE_DIR}/src/configurationoptions.txt | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
211 | WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
212 | add_dependencies(ldforge config_collection) | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
213 | set_source_files_properties (${CMAKE_BINARY_DIR}/configuration.cpp PROPERTIES GENERATED TRUE) | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
214 | set_property(SOURCE configuration.cpp PROPERTY SKIP_AUTOGEN ON) | 
| 
 
0abada2a9802
added automated configuration collection
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
39 
diff
changeset
 | 
215 | |
| 
114
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
216 | |
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
217 | add_custom_target(linelength ALL | 
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
218 | COMMAND python3 | 
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
219 | "${CMAKE_SOURCE_DIR}/tools/linelength.py" | 
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
220 | ${LDFORGE_SOURCES} | 
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
221 | ${LDFORGE_HEADERS} | 
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
222 | WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) | 
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
223 | add_dependencies(ldforge linelength) | 
| 
 
4e03b0e2a29f
added build-time test for line length
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
112 
diff
changeset
 | 
224 | |
| 
7
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
225 | # Collect the current hg revision into hginfo.h | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
226 | add_custom_target(revision_check ALL | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
227 | COMMAND python3 "${CMAKE_SOURCE_DIR}/tools/updaterevision.py" --cwd "$(CMAKE_SOURCE_DIR)" hginfo.h | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
228 | WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
229 | add_dependencies(ldforge revision_check) | 
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
230 | |
| 
 
68443f5be176
added the settings editor
 
Teemu Piippo <teemu@hecknology.net> 
parents: 
6 
diff
changeset
 | 
231 | install(TARGETS ldforge RUNTIME DESTINATION bin) |