Mercurial > ldforge / annotate

CMakeLists.txt@bf373bd83c1f (annotated)

CMakeLists.txt

Fri, 22 Jun 2018 14:33:09 +0300

author
Teemu Piippo <teemu@hecknology.net>
date
Fri, 22 Jun 2018 14:33:09 +0300
changeset 1422
bf373bd83c1f
parent 1421
25584737611c
child 1428
ece049033adc
permissions
-rw-r--r--

simplified format()

632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
1 ######################################################################
845
fec7023e91a7 - added a code generator to produce a configuration.inc which replaces the old, DIABOLIC configuration indexing mechanism
Teemu Piippo <crimsondusk64@gmail.com>
parents: 842
diff changeset
2 #
fec7023e91a7 - added a code generator to produce a configuration.inc which replaces the old, DIABOLIC configuration indexing mechanism
Teemu Piippo <crimsondusk64@gmail.com>
parents: 842
diff changeset
3 # CMake file for LDForge.
fec7023e91a7 - added a code generator to produce a configuration.inc which replaces the old, DIABOLIC configuration indexing mechanism
Teemu Piippo <crimsondusk64@gmail.com>
parents: 842
diff changeset
4 # The original QMake file was created on Sat Sep 22 17:29:49 2012
fec7023e91a7 - added a code generator to produce a configuration.inc which replaces the old, DIABOLIC configuration indexing mechanism
Teemu Piippo <crimsondusk64@gmail.com>
parents: 842
diff changeset
5 #
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
6 ######################################################################
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
7
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
8 project (ldforge)
1421
25584737611c Fixed cmake warning
Teemu Piippo <teemu@hecknology.net>
parents: 1420
diff changeset
9 cmake_minimum_required(VERSION 2.8.12)
1420
23f62b34f8e9 added Cotire to speed up compilation
Teemu Piippo <teemu@hecknology.net>
parents: 1417
diff changeset
10 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
23f62b34f8e9 added Cotire to speed up compilation
Teemu Piippo <teemu@hecknology.net>
parents: 1417
diff changeset
11 include(cotire)
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
12
801
f6abc9eb4217 - made transparent direct colors a compile-time opt-in since it appears to be non-standard
Santeri Piippo <crimsondusk64@gmail.com>
parents: 785
diff changeset
13 option (TRANSPARENT_DIRECT_COLORS "Enables non-standard transparent direct colors" OFF)
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
14
1040
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
15 find_package (Qt5Widgets REQUIRED)
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
16 find_package (Qt5Core REQUIRED)
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
17 find_package (Qt5OpenGL REQUIRED)
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
18 find_package (Qt5Network REQUIRED)
1310
e5c1320e1018 remove LDPaths
Teemu Piippo <teemu@hecknology.net>
parents: 1308
diff changeset
19
1311
8d22e1dd272d ported qOverload to drop minimum Qt requirement down to 5.5
Teemu Piippo <teemu@hecknology.net>
parents: 1310
diff changeset
20 if (Qt5Widgets_VERSION VERSION_LESS 5.5.0)
8d22e1dd272d ported qOverload to drop minimum Qt requirement down to 5.5
Teemu Piippo <teemu@hecknology.net>
parents: 1310
diff changeset
21 message(FATAL_ERROR "Qt5 version 5.5 required")
8d22e1dd272d ported qOverload to drop minimum Qt requirement down to 5.5
Teemu Piippo <teemu@hecknology.net>
parents: 1310
diff changeset
22 endif()
8d22e1dd272d ported qOverload to drop minimum Qt requirement down to 5.5
Teemu Piippo <teemu@hecknology.net>
parents: 1310
diff changeset
23
1040
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
24 set (CMAKE_AUTOMOC ON)
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
25
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
26 find_package (OpenGL REQUIRED)
801
f6abc9eb4217 - made transparent direct colors a compile-time opt-in since it appears to be non-standard
Santeri Piippo <crimsondusk64@gmail.com>
parents: 785
diff changeset
27
970
c8aae45afd85 Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 969
diff changeset
28 add_custom_target (revision_check ALL
c8aae45afd85 Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 969
diff changeset
29 COMMAND python "${CMAKE_SOURCE_DIR}/tools/updaterevision.py" hginfo.h
c8aae45afd85 Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 969
diff changeset
30 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
31
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
32 include_directories (${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
33
1017
fc1c13db9618 Renamed ConfigurationValueBag to Configuration and added a pointer to it into HierarchyElement. This helps with the fight against global variables.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1015
diff changeset
34 set_source_files_properties (${CMAKE_BINARY_DIR}/configuration.cpp PROPERTIES GENERATED TRUE)
1392
0541d9b21968 fix compiler warnings
Teemu Piippo <teemu@hecknology.net>
parents: 1391
diff changeset
35 set_property(SOURCE configuration.cpp PROPERTY SKIP_AUTOMOC ON)
972
a34b73114823 Now doesn't crash anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 971
diff changeset
36
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
37 set (LDFORGE_SOURCES
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
38 src/basics.cpp
1103
ac7db4c076c3 Created a new GLRenderer derivative class "Canvas" and made MainWindow use it
Teemu Piippo <teemu@hecknology.net>
parents: 1100
diff changeset
39 src/canvas.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
40 src/colors.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
41 src/crashCatcher.cpp
997
1b49f34e533d Commit work done on document manager. Happy 3rd birthday LDForge!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 994
diff changeset
42 src/documentmanager.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
43 src/editHistory.cpp
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
44 src/glcamera.cpp
1146
bb728c124d47 Renamed glCompiler.cpp → glcompiler.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1145
diff changeset
45 src/glcompiler.cpp
1144
4f226fd97826 Renamed glRenderer.cpp → glrenderer.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1141
diff changeset
46 src/glrenderer.cpp
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1019
diff changeset
47 src/grid.cpp
974
b2fa5f89798a Added a GuiUtilities class to contain useful non-MainWindow-related GUI functions
Teemu Piippo <crimsondusk64@gmail.com>
parents: 972
diff changeset
48 src/guiutilities.cpp
1291
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
49 src/headerhistorymodel.cpp
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
50 src/hierarchyelement.cpp
1145
02264bf0108d Renamed ldDocument.cpp → lddocument.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1144
diff changeset
51 src/lddocument.cpp
1308
dcc8c02530c2 Begin rework to add support for multiple libraries
Teemu Piippo <teemu@hecknology.net>
parents: 1301
diff changeset
52 src/librariesmodel.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
53 src/main.cpp
962
a4b463a7ee82 Rename MainWindow files
Teemu Piippo <crimsondusk64@gmail.com>
parents: 958
diff changeset
54 src/mainwindow.cpp
1073
a0a0d581309b Major overhaul of object→document relationship: added the Model class which models the object buffer. Each object is to be included in a model (an invariant that currently does not hold). A document is a subclass of a model. The LDObject is also now agnostic about selection, and the selection is now a set. A lot of things are probably broken now but it's a major step forward.
Teemu Piippo <teemu@hecknology.net>
parents: 1071
diff changeset
55 src/model.cpp
994
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
56 src/partdownloader.cpp
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
57 src/partdownloadrequest.cpp
1288
d1e45f90654b Header parsing complete, moved all parsing code into a new class. Documents are now all loaded in one go.
Teemu Piippo <teemu@hecknology.net>
parents: 1283
diff changeset
58 src/parser.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
59 src/primitives.cpp
1269
ec691d9472b3 Added LDObject serialization and refactored the internal resource managing to use it. No more tearing objects from one model into another, and this provides a stable way to keep an object's state in memory such as the edit history.
Santeri Piippo
parents: 1251
diff changeset
60 src/serializer.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
61 src/ringFinder.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
62 src/version.cpp
1319
39d7a9642eea reorganized headers
Teemu Piippo <teemu@hecknology.net>
parents: 1318
diff changeset
63 src/algorithms/geometry.cpp
1301
4a4e9fb9da76 moved inverting code into a new file
Teemu Piippo <teemu@hecknology.net>
parents: 1297
diff changeset
64 src/algorithms/invert.cpp
950
5df69eb50182 Move colorSelector.cc to dialogs/colorselector.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 948
diff changeset
65 src/dialogs/colorselector.cpp
975
24ba5aa3393f Move ConfigDialog into src/dialogs/ subfolder
Teemu Piippo <crimsondusk64@gmail.com>
parents: 974
diff changeset
66 src/dialogs/configdialog.cpp
1406
37fffb682d2f Circular primitive editor complete
Teemu Piippo <teemu@hecknology.net>
parents: 1403
diff changeset
67 src/dialogs/circularprimitiveeditor.cpp
1116
3b1d2cc6603e Moved dialogs.cpp to dialogs/externalprogrampathdialog.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1103
diff changeset
68 src/dialogs/externalprogrampathdialog.cpp
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
69 src/dialogs/generateprimitivedialog.cpp
953
8349552ee5e9 Refactor LDrawPathDialog and LDPaths
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
70 src/dialogs/ldrawpathdialog.cpp
1297
389516787a4c added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents: 1296
diff changeset
71 src/dialogs/subfilereferenceeditor.cpp
954
7feaa1a3c438 Refactor the new part dialog into a new class
Teemu Piippo <crimsondusk64@gmail.com>
parents: 953
diff changeset
72 src/dialogs/newpartdialog.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
73 src/editmodes/abstractEditMode.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
74 src/editmodes/circleMode.cpp
1000
c064cc048f14 Begin work on Bézier curve support. They can be drawn but don't render in 3D and they load as comments.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 997
diff changeset
75 src/editmodes/curvemode.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
76 src/editmodes/drawMode.cpp
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
77 src/editmodes/linePathMode.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
78 src/editmodes/magicWandMode.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
79 src/editmodes/rectangleMode.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
80 src/editmodes/selectMode.cpp
1251
e75cc5bff076 Converted magic wand mode and other selection stuff to mvc
Santeri Piippo
parents: 1249
diff changeset
81 src/geometry/linesegment.cpp
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1387
diff changeset
82 src/geometry/plane.cpp
1398
1c70d3447d20 changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents: 1395
diff changeset
83 src/linetypes/circularprimitive.cpp
1117
efcb47c64a72 Moved LDComment and LDEmpty into their own source file pairs.
Teemu Piippo <teemu@hecknology.net>
parents: 1116
diff changeset
84 src/linetypes/comment.cpp
1141
7dc2c981937e Split LDConditionalEdge and LDEdgeLine into new source pairs
Teemu Piippo <teemu@hecknology.net>
parents: 1129
diff changeset
85 src/linetypes/conditionaledge.cpp
7dc2c981937e Split LDConditionalEdge and LDEdgeLine into new source pairs
Teemu Piippo <teemu@hecknology.net>
parents: 1129
diff changeset
86 src/linetypes/edgeline.cpp
1117
efcb47c64a72 Moved LDComment and LDEmpty into their own source file pairs.
Teemu Piippo <teemu@hecknology.net>
parents: 1116
diff changeset
87 src/linetypes/empty.cpp
1147
a26568aa3cce Renamed ldObject.cpp → linetypes/modelobject.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1146
diff changeset
88 src/linetypes/modelobject.cpp
1149
502c866b8512 Moved LDQuadrilateral into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents: 1148
diff changeset
89 src/linetypes/quadrilateral.cpp
1148
96cb15a7611f Moved LDTriangle into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents: 1147
diff changeset
90 src/linetypes/triangle.cpp
969
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
91 src/toolsets/algorithmtoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
92 src/toolsets/basictoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
93 src/toolsets/extprogramtoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
94 src/toolsets/filetoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
95 src/toolsets/movetoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
96 src/toolsets/toolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
97 src/toolsets/viewtoolset.cpp
1315
23d48a709ffc moved Vertex and BoundingBox into new code units
Teemu Piippo <teemu@hecknology.net>
parents: 1311
diff changeset
98 src/types/boundingbox.cpp
23d48a709ffc moved Vertex and BoundingBox into new code units
Teemu Piippo <teemu@hecknology.net>
parents: 1311
diff changeset
99 src/types/vertex.cpp
1417
ed39bfca7a67 refactored the segments/divisions editor in MainWindow to a new widget
Teemu Piippo <teemu@hecknology.net>
parents: 1406
diff changeset
100 src/widgets/circularsectioneditor.cpp
1395
23551de3da36 separated the color button into a new widget
Teemu Piippo <teemu@hecknology.net>
parents: 1392
diff changeset
101 src/widgets/colorbutton.cpp
1387
6393b6020c62 added a doublespinbox variant that uses "." as the decimal point and omits trailing zeros
Teemu Piippo <teemu@hecknology.net>
parents: 1380
diff changeset
102 src/widgets/doublespinbox.cpp
1291
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
103 src/widgets/headeredit.cpp
1391
5fa4bf1fc781 added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents: 1390
diff changeset
104 src/widgets/matrixeditor.cpp
1296
aee618d087ff Added vertex object editing dialog
Teemu Piippo <teemu@hecknology.net>
parents: 1294
diff changeset
105 src/widgets/vertexobjecteditor.cpp
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
106 )
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
107
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
108 set (LDFORGE_HEADERS
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
109 src/basics.h
1103
ac7db4c076c3 Created a new GLRenderer derivative class "Canvas" and made MainWindow use it
Teemu Piippo <teemu@hecknology.net>
parents: 1100
diff changeset
110 src/canvas.h
655
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
111 src/colors.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
112 src/crashCatcher.h
997
1b49f34e533d Commit work done on document manager. Happy 3rd birthday LDForge!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 994
diff changeset
113 src/documentmanager.h
655
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
114 src/editHistory.h
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
115 src/format.h
1129
2b20261dc511 Exported GLRenderer cameras into a new class, GLCamera.
Teemu Piippo <teemu@hecknology.net>
parents: 1125
diff changeset
116 src/glcamera.h
1146
bb728c124d47 Renamed glCompiler.cpp → glcompiler.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1145
diff changeset
117 src/glcompiler.h
1144
4f226fd97826 Renamed glRenderer.cpp → glrenderer.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1141
diff changeset
118 src/glrenderer.h
1183
caa20ed02728 CMake fixes
Teemu Piippo <teemu@hecknology.net>
parents: 1164
diff changeset
119 src/glShared.h
1023
9450ac3cd930 Split grid stuff into a new class Grid in grid.cpp/grid.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1019
diff changeset
120 src/grid.h
974
b2fa5f89798a Added a GuiUtilities class to contain useful non-MainWindow-related GUI functions
Teemu Piippo <crimsondusk64@gmail.com>
parents: 972
diff changeset
121 src/guiutilities.h
1291
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
122 src/headerhistorymodel.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
123 src/hierarchyelement.h
1145
02264bf0108d Renamed ldDocument.cpp → lddocument.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1144
diff changeset
124 src/lddocument.h
1005
a88cf5a32246 Subject Bézier curve fineness to the grid. By default, the coarse grid uses 8 segments, medium 16 and fine 32. Moved rasterization from demoting to inlining, it feels more sensible for it to be there.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1000
diff changeset
125 src/ldobjectiterator.h
1308
dcc8c02530c2 Begin rework to add support for multiple libraries
Teemu Piippo <teemu@hecknology.net>
parents: 1301
diff changeset
126 src/librariesmodel.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
127 src/main.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
128 src/mainwindow.h
1073
a0a0d581309b Major overhaul of object→document relationship: added the Model class which models the object buffer. Each object is to be included in a model (an invariant that currently does not hold). A document is a subclass of a model. The LDObject is also now agnostic about selection, and the selection is now a set. A lot of things are probably broken now but it's a major step forward.
Teemu Piippo <teemu@hecknology.net>
parents: 1071
diff changeset
129 src/model.h
994
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
130 src/partdownloader.h
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
131 src/partdownloadrequest.h
1288
d1e45f90654b Header parsing complete, moved all parsing code into a new class. Documents are now all loaded in one go.
Teemu Piippo <teemu@hecknology.net>
parents: 1283
diff changeset
132 src/parser.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
133 src/primitives.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
134 src/ringFinder.h
1269
ec691d9472b3 Added LDObject serialization and refactored the internal resource managing to use it. No more tearing objects from one model into another, and this provides a stable way to keep an object's state in memory such as the edit history.
Santeri Piippo
parents: 1251
diff changeset
135 src/serializer.h
1318
568fcfc6da71 removed unnecessary files and includes
Teemu Piippo <teemu@hecknology.net>
parents: 1317
diff changeset
136 src/version.h
1319
39d7a9642eea reorganized headers
Teemu Piippo <teemu@hecknology.net>
parents: 1318
diff changeset
137 src/algorithms/geometry.h
1301
4a4e9fb9da76 moved inverting code into a new file
Teemu Piippo <teemu@hecknology.net>
parents: 1297
diff changeset
138 src/algorithms/invert.h
950
5df69eb50182 Move colorSelector.cc to dialogs/colorselector.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 948
diff changeset
139 src/dialogs/colorselector.h
975
24ba5aa3393f Move ConfigDialog into src/dialogs/ subfolder
Teemu Piippo <crimsondusk64@gmail.com>
parents: 974
diff changeset
140 src/dialogs/configdialog.h
1406
37fffb682d2f Circular primitive editor complete
Teemu Piippo <teemu@hecknology.net>
parents: 1403
diff changeset
141 src/dialogs/circularprimitiveeditor.h
1116
3b1d2cc6603e Moved dialogs.cpp to dialogs/externalprogrampathdialog.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1103
diff changeset
142 src/dialogs/externalprogrampathdialog.h
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
143 src/dialogs/generateprimitivedialog.h
953
8349552ee5e9 Refactor LDrawPathDialog and LDPaths
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
144 src/dialogs/ldrawpathdialog.h
954
7feaa1a3c438 Refactor the new part dialog into a new class
Teemu Piippo <crimsondusk64@gmail.com>
parents: 953
diff changeset
145 src/dialogs/newpartdialog.h
1297
389516787a4c added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents: 1296
diff changeset
146 src/dialogs/subfilereferenceeditor.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
147 src/editmodes/abstractEditMode.h
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
148 src/editmodes/circleMode.h
1000
c064cc048f14 Begin work on Bézier curve support. They can be drawn but don't render in 3D and they load as comments.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 997
diff changeset
149 src/editmodes/curvemode.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
150 src/editmodes/drawMode.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
151 src/editmodes/linePathMode.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
152 src/editmodes/magicWandMode.h
841
1243abd47381 - split the rectangle ability out of the draw mode into its own edit mode
Teemu Piippo <crimsondusk64@gmail.com>
parents: 830
diff changeset
153 src/editmodes/rectangleMode.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
154 src/editmodes/selectMode.h
1326
69a90bd2dba2 Happy new year 2018
Teemu Piippo <teemu@hecknology.net>
parents: 1319
diff changeset
155 src/generics/enums.h
1319
39d7a9642eea reorganized headers
Teemu Piippo <teemu@hecknology.net>
parents: 1318
diff changeset
156 src/generics/functions.h
1273
900f1dfae46b Implemented row moving in the model and replaced swapping with it
Santeri Piippo
parents: 1269
diff changeset
157 src/generics/migrate.h
900f1dfae46b Implemented row moving in the model and replaced swapping with it
Santeri Piippo
parents: 1269
diff changeset
158 src/generics/range.h
1249
6a8f76f0f4d1 convert MainWindow::deleteSelection to mvc
Santeri Piippo
parents: 1243
diff changeset
159 src/generics/reverse.h
1319
39d7a9642eea reorganized headers
Teemu Piippo <teemu@hecknology.net>
parents: 1318
diff changeset
160 src/generics/ring.h
39d7a9642eea reorganized headers
Teemu Piippo <teemu@hecknology.net>
parents: 1318
diff changeset
161 src/generics/transform.h
1251
e75cc5bff076 Converted magic wand mode and other selection stuff to mvc
Santeri Piippo
parents: 1249
diff changeset
162 src/geometry/linesegment.h
1390
3eace926af7f added draw plane feature (doesn't work with circle draw quite right yet)
Teemu Piippo <teemu@hecknology.net>
parents: 1387
diff changeset
163 src/geometry/plane.h
1398
1c70d3447d20 changed LDCylinder to LDCircularPrimitive and moved circles to it
Teemu Piippo <teemu@hecknology.net>
parents: 1395
diff changeset
164 src/linetypes/circularprimitive.h
1117
efcb47c64a72 Moved LDComment and LDEmpty into their own source file pairs.
Teemu Piippo <teemu@hecknology.net>
parents: 1116
diff changeset
165 src/linetypes/comment.h
1141
7dc2c981937e Split LDConditionalEdge and LDEdgeLine into new source pairs
Teemu Piippo <teemu@hecknology.net>
parents: 1129
diff changeset
166 src/linetypes/conditionaledge.h
7dc2c981937e Split LDConditionalEdge and LDEdgeLine into new source pairs
Teemu Piippo <teemu@hecknology.net>
parents: 1129
diff changeset
167 src/linetypes/edgeline.h
1117
efcb47c64a72 Moved LDComment and LDEmpty into their own source file pairs.
Teemu Piippo <teemu@hecknology.net>
parents: 1116
diff changeset
168 src/linetypes/empty.h
1147
a26568aa3cce Renamed ldObject.cpp → linetypes/modelobject.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1146
diff changeset
169 src/linetypes/modelobject.h
1149
502c866b8512 Moved LDQuadrilateral into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents: 1148
diff changeset
170 src/linetypes/quadrilateral.h
1148
96cb15a7611f Moved LDTriangle into its own source pair.
Teemu Piippo <teemu@hecknology.net>
parents: 1147
diff changeset
171 src/linetypes/triangle.h
969
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
172 src/toolsets/algorithmtoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
173 src/toolsets/basictoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
174 src/toolsets/extprogramtoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
175 src/toolsets/filetoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
176 src/toolsets/movetoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
177 src/toolsets/toolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
178 src/toolsets/viewtoolset.h
1315
23d48a709ffc moved Vertex and BoundingBox into new code units
Teemu Piippo <teemu@hecknology.net>
parents: 1311
diff changeset
179 src/types/boundingbox.h
1319
39d7a9642eea reorganized headers
Teemu Piippo <teemu@hecknology.net>
parents: 1318
diff changeset
180 src/types/library.h
1315
23d48a709ffc moved Vertex and BoundingBox into new code units
Teemu Piippo <teemu@hecknology.net>
parents: 1311
diff changeset
181 src/types/vertex.h
1417
ed39bfca7a67 refactored the segments/divisions editor in MainWindow to a new widget
Teemu Piippo <teemu@hecknology.net>
parents: 1406
diff changeset
182 src/widgets/circularsectioneditor.h
1395
23551de3da36 separated the color button into a new widget
Teemu Piippo <teemu@hecknology.net>
parents: 1392
diff changeset
183 src/widgets/colorbutton.h
1387
6393b6020c62 added a doublespinbox variant that uses "." as the decimal point and omits trailing zeros
Teemu Piippo <teemu@hecknology.net>
parents: 1380
diff changeset
184 src/widgets/doublespinbox.h
1291
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
185 src/widgets/headeredit.h
1391
5fa4bf1fc781 added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents: 1390
diff changeset
186 src/widgets/matrixeditor.h
1296
aee618d087ff Added vertex object editing dialog
Teemu Piippo <teemu@hecknology.net>
parents: 1294
diff changeset
187 src/widgets/vertexobjecteditor.h
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
188 )
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
189
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
190 set (LDFORGE_FORMS
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
191 src/dialogs/aboutdialog.ui
950
5df69eb50182 Move colorSelector.cc to dialogs/colorselector.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 948
diff changeset
192 src/dialogs/colorselector.ui
975
24ba5aa3393f Move ConfigDialog into src/dialogs/ subfolder
Teemu Piippo <crimsondusk64@gmail.com>
parents: 974
diff changeset
193 src/dialogs/configdialog.ui
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
194 src/dialogs/covererdialog.ui
1406
37fffb682d2f Circular primitive editor complete
Teemu Piippo <teemu@hecknology.net>
parents: 1403
diff changeset
195 src/dialogs/circularprimitiveeditor.ui
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
196 src/dialogs/edger2dialog.ui
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
197 src/dialogs/editrawdialog.ui
1116
3b1d2cc6603e Moved dialogs.cpp to dialogs/externalprogrampathdialog.cpp
Teemu Piippo <teemu@hecknology.net>
parents: 1103
diff changeset
198 src/dialogs/externalprogrampathdialog.ui
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
199 src/dialogs/flipdialog.ui
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
200 src/dialogs/generateprimitivedialog.ui
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
201 src/dialogs/intersectordialog.ui
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
202 src/dialogs/isecalcdialog.ui
953
8349552ee5e9 Refactor LDrawPathDialog and LDPaths
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
203 src/dialogs/ldrawpathdialog.ui
954
7feaa1a3c438 Refactor the new part dialog into a new class
Teemu Piippo <crimsondusk64@gmail.com>
parents: 953
diff changeset
204 src/dialogs/newpartdialog.ui
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
205 src/dialogs/rectifierdialog.ui
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
206 src/dialogs/replacecoordinatesdialog.ui
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
207 src/dialogs/rotationpointdialog.ui
1297
389516787a4c added subfile reference editor
Teemu Piippo <teemu@hecknology.net>
parents: 1296
diff changeset
208 src/dialogs/subfilereferenceeditor.ui
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
209 src/dialogs/ytruderdialog.ui
1294
adaad0b329e2 Added a new tool for clamping vertices
Teemu Piippo <teemu@hecknology.net>
parents: 1293
diff changeset
210 src/toolsets/fixroundingerrors.ui
1164
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
211 src/mainwindow.ui
eabcd749759a Moved all UI files from ui/ into src/dialogs/.
Teemu Piippo <teemu@hecknology.net>
parents: 1163
diff changeset
212 src/partdownloader.ui
1417
ed39bfca7a67 refactored the segments/divisions editor in MainWindow to a new widget
Teemu Piippo <teemu@hecknology.net>
parents: 1406
diff changeset
213 src/widgets/circularsectioneditor.ui
1296
aee618d087ff Added vertex object editing dialog
Teemu Piippo <teemu@hecknology.net>
parents: 1294
diff changeset
214 src/widgets/vertexobjecteditor.ui
1291
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
215 src/widgets/headeredit.ui
1391
5fa4bf1fc781 added work done on cylinders
Teemu Piippo <teemu@hecknology.net>
parents: 1390
diff changeset
216 src/widgets/matrixeditor.ui
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
217 )
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
218
1125
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
219 set (LDFORGE_OTHER_FILES
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
220 src/configurationoptions.txt
1283
3c3a5eb965f7 added an MVC interface to the primitives tree
Teemu Piippo <teemu@hecknology.net>
parents: 1273
diff changeset
221 data/primitive-categories.cfg
1125
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
222 )
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
223
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
224 set (LDFORGE_RESOURCES ldforge.qrc)
1291
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
225 set(CMAKE_CXX_STANDARD 14)
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
226 set(CMAKE_CXX_STANDARD_REQUIRED ON)
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
227 set(CMAKE_CXX_EXTENSIONS OFF)
660
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
228
801
f6abc9eb4217 - made transparent direct colors a compile-time opt-in since it appears to be non-standard
Santeri Piippo <crimsondusk64@gmail.com>
parents: 785
diff changeset
229 if (TRANSPARENT_DIRECT_COLORS)
f6abc9eb4217 - made transparent direct colors a compile-time opt-in since it appears to be non-standard
Santeri Piippo <crimsondusk64@gmail.com>
parents: 785
diff changeset
230 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTRANSPARENT_DIRECT_COLORS")
f6abc9eb4217 - made transparent direct colors a compile-time opt-in since it appears to be non-standard
Santeri Piippo <crimsondusk64@gmail.com>
parents: 785
diff changeset
231 endif()
f6abc9eb4217 - made transparent direct colors a compile-time opt-in since it appears to be non-standard
Santeri Piippo <crimsondusk64@gmail.com>
parents: 785
diff changeset
232
660
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
233 # With clang, we need to set -Wno-deprecated since Qt headers seem to use the
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
234 # register keyword which clang doesn't seem to like. It also appears that Qt
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
235 # doesn't set Q_COMPILER_INITIALIZER_LISTS when compiling with clang? What's
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
236 # up with that?
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
237 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
972
a34b73114823 Now doesn't crash anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 971
diff changeset
238 #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
660
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
239 endif()
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
240
633
34d18b9c2cab - fixed compilation
Santeri Piippo <crimsondusk64@gmail.com>
parents: 632
diff changeset
241 include_directories ("${PROJECT_BINARY_DIR}")
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
242 include_directories ("${PROJECT_BINARY_DIR}/src")
1291
9c570a30c98a Added basic header editing
Teemu Piippo <teemu@hecknology.net>
parents: 1288
diff changeset
243 include_directories ("${PROJECT_SOURCE_DIR}/src")
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
244
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
245 if (NOT MSVC)
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
246 if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
247 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG")
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
248 endif()
1392
0541d9b21968 fix compiler warnings
Teemu Piippo <teemu@hecknology.net>
parents: 1391
diff changeset
249 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=all -Wextra")
0541d9b21968 fix compiler warnings
Teemu Piippo <teemu@hecknology.net>
parents: 1391
diff changeset
250 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-fallthrough")
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
251 endif()
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
252
1040
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
253 qt5_add_resources (LDFORGE_QRC ${LDFORGE_RESOURCES})
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
254 qt5_wrap_ui (LDFORGE_FORMS_HEADERS ${LDFORGE_FORMS})
1183
caa20ed02728 CMake fixes
Teemu Piippo <teemu@hecknology.net>
parents: 1164
diff changeset
255 add_executable (ldforge WIN32 ${LDFORGE_SOURCES} ${LDFORGE_HEADERS} ${LDFORGE_OTHER_FILES}
1040
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
256 ${LDFORGE_QRC} ${LDFORGE_FORMS_HEADERS}
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
257 ${CMAKE_BINARY_DIR}/configuration.cpp)
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
258
1125
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
259 set_source_files_properties(${LDFORGE_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE)
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
260 set_source_files_properties(${LDFORGE_OTHER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE)
991
cb6b3625adf4 Use automoc so that it compiles again...
Teemu Piippo <crimsondusk64@gmail.com>
parents: 990
diff changeset
261 set_target_properties (ldforge PROPERTIES AUTOMOC 1)
1040
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
262 target_link_libraries (ldforge Qt5::Widgets Qt5::Network Qt5::OpenGL ${OPENGL_LIBRARIES})
1420
23f62b34f8e9 added Cotire to speed up compilation
Teemu Piippo <teemu@hecknology.net>
parents: 1417
diff changeset
263 cotire(ldforge)
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
264
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
265 add_custom_target (config_collection ALL
1125
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
266 COMMAND python3
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
267 "${CMAKE_SOURCE_DIR}/tools/configcollector.py"
1017
fc1c13db9618 Renamed ConfigurationValueBag to Configuration and added a pointer to it into HierarchyElement. This helps with the fight against global variables.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1015
diff changeset
268 --header ${CMAKE_BINARY_DIR}/configuration.h
fc1c13db9618 Renamed ConfigurationValueBag to Configuration and added a pointer to it into HierarchyElement. This helps with the fight against global variables.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1015
diff changeset
269 --source ${CMAKE_BINARY_DIR}/configuration.cpp
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
270 --sourcedir ${CMAKE_SOURCE_DIR}/src
1125
d8f94e56d42e Moved the definitions of all configuration options into a new text file and made the configuration collector read that.
Teemu Piippo <teemu@hecknology.net>
parents: 1117
diff changeset
271 ${CMAKE_SOURCE_DIR}/src/configurationoptions.txt
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
272 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
273
1015
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
274 add_custom_target(lengthcheck ALL
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
275 COMMAND python
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
276 "${CMAKE_SOURCE_DIR}/tools/linelength.py"
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
277 ${LDFORGE_SOURCES}
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
278 ${LDFORGE_HEADERS}
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
279 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
280
970
c8aae45afd85 Commit configuration rework (doesn't work yet, more than most probably doesn't compile either)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 969
diff changeset
281 add_dependencies (ldforge revision_check config_collection)
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
282 install (TARGETS ldforge RUNTIME DESTINATION bin)

Mercurial Repository: ldforge

mercurial