Mercurial > ldforge / annotate

CMakeLists.txt@7cc929d8fc4d (annotated)

CMakeLists.txt

Wed, 08 Feb 2017 17:07:19 +0200

author
Teemu Piippo <teemu@hecknology.net>
date
Wed, 08 Feb 2017 17:07:19 +0200
changeset 1096
7cc929d8fc4d
parent 1075
711c5fff384d
child 1100
9b2797729c82
permissions
-rw-r--r--

Simplified GLRenderer::convert3dTo2d. The multiplication with the modelview matrix is not necessary, it's identity all the time... with that, I think the function makes much more sense now.

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)
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
9 cmake_minimum_required (VERSION 2.6)
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
10
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
11 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
12
1040
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
13 find_package (Qt5Widgets REQUIRED)
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
14 find_package (Qt5Core REQUIRED)
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
15 find_package (Qt5OpenGL REQUIRED)
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
16 find_package (Qt5Network REQUIRED)
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
17 set (CMAKE_AUTOMOC ON)
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
18
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
19 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
20
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
21 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
22 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
23 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
24
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
25 include_directories (${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
26
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
27 set_source_files_properties (${CMAKE_BINARY_DIR}/configuration.cpp PROPERTIES GENERATED TRUE)
972
a34b73114823 Now doesn't crash anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 971
diff changeset
28
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
29 set (LDFORGE_SOURCES
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
30 src/basics.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
31 src/colors.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
32 src/crashCatcher.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
33 src/dialogs.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
34 src/documentation.cpp
980
4a95c6b06ebe Split LDFileLoader (now LDDocumentLoader) into its own files
Teemu Piippo <crimsondusk64@gmail.com>
parents: 975
diff changeset
35 src/documentloader.cpp
997
1b49f34e533d Commit work done on document manager. Happy 3rd birthday LDForge!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 994
diff changeset
36 src/documentmanager.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
37 src/editHistory.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
38 src/glRenderer.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
39 src/glCompiler.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
40 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
41 src/guiutilities.cpp
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
42 src/hierarchyelement.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
43 src/ldDocument.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
44 src/ldObject.cpp
953
8349552ee5e9 Refactor LDrawPathDialog and LDPaths
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
45 src/ldpaths.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
46 src/main.cpp
962
a4b463a7ee82 Rename MainWindow files
Teemu Piippo <crimsondusk64@gmail.com>
parents: 958
diff changeset
47 src/mainwindow.cpp
1025
4949da3fb4b3 Renamed ldObjectMath.cpp/.h to mathfunctions.cpp/.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1023
diff changeset
48 src/mathfunctions.cpp
1071
ff4639b672ae Matrices are now input with 9 spinboxes instead of a MLCad-style line edit
Teemu Piippo <teemu@hecknology.net>
parents: 1040
diff changeset
49 src/matrixinput.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
50 src/messageLog.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
51 src/miscallenous.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
52 src/model.cpp
994
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
53 src/partdownloader.cpp
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
54 src/partdownloadrequest.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
55 src/primitives.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
56 src/radioGroup.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
57 src/ringFinder.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
58 src/version.cpp
950
5df69eb50182 Move colorSelector.cc to dialogs/colorselector.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 948
diff changeset
59 src/dialogs/colorselector.cpp
975
24ba5aa3393f Move ConfigDialog into src/dialogs/ subfolder
Teemu Piippo <crimsondusk64@gmail.com>
parents: 974
diff changeset
60 src/dialogs/configdialog.cpp
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
61 src/dialogs/generateprimitivedialog.cpp
953
8349552ee5e9 Refactor LDrawPathDialog and LDPaths
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
62 src/dialogs/ldrawpathdialog.cpp
954
7feaa1a3c438 Refactor the new part dialog into a new class
Teemu Piippo <crimsondusk64@gmail.com>
parents: 953
diff changeset
63 src/dialogs/newpartdialog.cpp
957
429c7ed3cc54 Refactor OpenProgressDialog out of dialogs.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 956
diff changeset
64 src/dialogs/openprogressdialog.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
65 src/editmodes/abstractEditMode.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
66 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
67 src/editmodes/curvemode.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
68 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
69 src/editmodes/linePathMode.cpp
952
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
70 src/editmodes/magicWandMode.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
71 src/editmodes/rectangleMode.cpp
f116b63c4844 Rename all .cc files to .cpp files.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 950
diff changeset
72 src/editmodes/selectMode.cpp
969
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
73 src/toolsets/algorithmtoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
74 src/toolsets/basictoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
75 src/toolsets/extprogramtoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
76 src/toolsets/filetoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
77 src/toolsets/movetoolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
78 src/toolsets/toolset.cpp
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
79 src/toolsets/viewtoolset.cpp
1037
4a9185e94d78 Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents: 1025
diff changeset
80 src/types/matrix.cpp
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
81 )
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
82
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
83 set (LDFORGE_HEADERS
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
84 src/basics.h
655
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
85 src/colors.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
86 src/crashCatcher.h
655
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
87 src/dialogs.h
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
88 src/documentation.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
89 src/documentloader.h
997
1b49f34e533d Commit work done on document manager. Happy 3rd birthday LDForge!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 994
diff changeset
90 src/documentmanager.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
91 src/doublemap.h
655
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
92 src/editHistory.h
b376645315ab - renamed files to camelCase
Santeri Piippo <crimsondusk64@gmail.com>
parents: 644
diff changeset
93 src/format.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
94 src/glCompiler.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
95 src/glRenderer.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
96 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
97 src/guiutilities.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
98 src/hierarchyelement.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
99 src/ldDocument.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
100 src/ldObject.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
101 src/ldobjectiterator.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
102 src/ldpaths.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
103 src/macros.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
104 src/main.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
105 src/mainwindow.h
1025
4949da3fb4b3 Renamed ldObjectMath.cpp/.h to mathfunctions.cpp/.h
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1023
diff changeset
106 src/mathfunctions.h
1071
ff4639b672ae Matrices are now input with 9 spinboxes instead of a MLCad-style line edit
Teemu Piippo <teemu@hecknology.net>
parents: 1040
diff changeset
107 src/matrixinput.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
108 src/messageLog.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
109 src/miscallenous.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
110 src/model.h
994
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
111 src/partdownloader.h
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
112 src/partdownloadrequest.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
113 src/primitives.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
114 src/radioGroup.h
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
115 src/ringFinder.h
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
116 src/transform.h
950
5df69eb50182 Move colorSelector.cc to dialogs/colorselector.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 948
diff changeset
117 src/dialogs/colorselector.h
975
24ba5aa3393f Move ConfigDialog into src/dialogs/ subfolder
Teemu Piippo <crimsondusk64@gmail.com>
parents: 974
diff changeset
118 src/dialogs/configdialog.h
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
119 src/dialogs/generateprimitivedialog.h
953
8349552ee5e9 Refactor LDrawPathDialog and LDPaths
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
120 src/dialogs/ldrawpathdialog.h
954
7feaa1a3c438 Refactor the new part dialog into a new class
Teemu Piippo <crimsondusk64@gmail.com>
parents: 953
diff changeset
121 src/dialogs/newpartdialog.h
957
429c7ed3cc54 Refactor OpenProgressDialog out of dialogs.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 956
diff changeset
122 src/dialogs/openprogressdialog.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
123 src/editmodes/abstractEditMode.h
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
124 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
125 src/editmodes/curvemode.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
126 src/editmodes/drawMode.h
989
1cd1d082a540 Sort LDFORGE_HEADERS in CMakeLists.txt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 988
diff changeset
127 src/editmodes/linePathMode.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
128 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
129 src/editmodes/rectangleMode.h
830
a741a0b9df49 - updated filenames
Santeri Piippo <crimsondusk64@gmail.com>
parents: 825
diff changeset
130 src/editmodes/selectMode.h
969
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
131 src/toolsets/algorithmtoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
132 src/toolsets/basictoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
133 src/toolsets/extprogramtoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
134 src/toolsets/filetoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
135 src/toolsets/movetoolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
136 src/toolsets/toolset.h
b1742ee91d5b Split actions.cpp and actionsEdit.cpp into toolsets.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 962
diff changeset
137 src/toolsets/viewtoolset.h
1037
4a9185e94d78 Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents: 1025
diff changeset
138 src/types/matrix.h
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
139 )
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
140
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
141 set (LDFORGE_FORMS
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
142 ui/about.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
143 ui/addhistoryline.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
144 ui/coverer.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
145 ui/edger2.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
146 ui/editraw.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
147 ui/extprogpath.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
148 ui/flip.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
149 ui/intersector.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
150 ui/isecalc.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
151 ui/overlay.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
152 ui/rectifier.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
153 ui/replcoords.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
154 ui/rotpoint.ui
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
155 ui/ytruder.ui
962
a4b463a7ee82 Rename MainWindow files
Teemu Piippo <crimsondusk64@gmail.com>
parents: 958
diff changeset
156 src/mainwindow.ui
994
09e1a3e272ec Split PartDownloadRequest into its own file
Teemu Piippo <crimsondusk64@gmail.com>
parents: 991
diff changeset
157 src/partdownloader.ui
950
5df69eb50182 Move colorSelector.cc to dialogs/colorselector.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 948
diff changeset
158 src/dialogs/colorselector.ui
975
24ba5aa3393f Move ConfigDialog into src/dialogs/ subfolder
Teemu Piippo <crimsondusk64@gmail.com>
parents: 974
diff changeset
159 src/dialogs/configdialog.ui
1019
a2e4286adb0d Split PrimitivePrompt into its new source files, renamed it to GeneratePrimitivePrompt
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1017
diff changeset
160 src/dialogs/generateprimitivedialog.ui
953
8349552ee5e9 Refactor LDrawPathDialog and LDPaths
Teemu Piippo <crimsondusk64@gmail.com>
parents: 952
diff changeset
161 src/dialogs/ldrawpathdialog.ui
954
7feaa1a3c438 Refactor the new part dialog into a new class
Teemu Piippo <crimsondusk64@gmail.com>
parents: 953
diff changeset
162 src/dialogs/newpartdialog.ui
957
429c7ed3cc54 Refactor OpenProgressDialog out of dialogs.cpp
Teemu Piippo <crimsondusk64@gmail.com>
parents: 956
diff changeset
163 src/dialogs/openprogressdialog.ui
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
164 )
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
165
661
577bc177a06f - renamed some cmake identifiers
Santeri Piippo <crimsondusk64@gmail.com>
parents: 660
diff changeset
166 set (LDFORGE_RESOURCES ldforge.qrc)
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
167 # set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGLU")
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
168
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
169 if (NOT MSVC)
972
a34b73114823 Now doesn't crash anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 971
diff changeset
170 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall")
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
171 endif()
660
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
172
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
173 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
174 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
175 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
176
660
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
177 # 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
178 # 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
179 # 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
180 # up with that?
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
181 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
972
a34b73114823 Now doesn't crash anymore
Teemu Piippo <crimsondusk64@gmail.com>
parents: 971
diff changeset
182 #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
660
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
183 endif()
bc589e352f5b - now compiles with clang
Santeri Piippo <crimsondusk64@gmail.com>
parents: 657
diff changeset
184
633
34d18b9c2cab - fixed compilation
Santeri Piippo <crimsondusk64@gmail.com>
parents: 632
diff changeset
185 include_directories ("${PROJECT_BINARY_DIR}")
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
186 include_directories ("${PROJECT_BINARY_DIR}/src")
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
187 include_directories ("${PROJECT_BINARY_DIR}/src/misc")
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
188
855
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
189 if (NOT MSVC)
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
190 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
191 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG")
e16f1587ef44 - fixed compilation on windows systems
Santeri Piippo <crimsondusk64@gmail.com>
parents: 845
diff changeset
192 endif()
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
193 endif()
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
194
1040
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
195 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
196 qt5_wrap_ui (LDFORGE_FORMS_HEADERS ${LDFORGE_FORMS})
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
197 add_executable (ldforge WIN32 ${LDFORGE_SOURCES} ${LDFORGE_HEADERS}
3301cf2ea7ff Dropped Qt 4 support. We're Qt 5 only now.
Teemu Piippo <teemu@hecknology.net>
parents: 1037
diff changeset
198 ${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
199 ${CMAKE_BINARY_DIR}/configuration.cpp)
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
200
991
cb6b3625adf4 Use automoc so that it compiles again...
Teemu Piippo <crimsondusk64@gmail.com>
parents: 990
diff changeset
201 set_source_files_properties (${LDFORGE_HEADERS} PROPERTIES HEADER_FILE_ONLY TRUE)
cb6b3625adf4 Use automoc so that it compiles again...
Teemu Piippo <crimsondusk64@gmail.com>
parents: 990
diff changeset
202 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
203 target_link_libraries (ldforge Qt5::Widgets Qt5::Network Qt5::OpenGL ${OPENGL_LIBRARIES})
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
204
971
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
205 add_custom_target (config_collection ALL
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
206 COMMAND python
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
207 "${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
208 --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
209 --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
210 --sourcedir ${CMAKE_SOURCE_DIR}/src
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
211 ${LDFORGE_SOURCES}
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
212 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
c00f9665a9f8 Now compiles and links but crashes shortly after startup.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 970
diff changeset
213
1015
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
214 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
215 COMMAND python
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
216 "${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
217 ${LDFORGE_SOURCES}
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
218 ${LDFORGE_HEADERS}
92c6ec099075 Added triangle count to viewport, added compile-time line length check
Teemu Piippo <crimsondusk64@gmail.com>
parents: 1005
diff changeset
219 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
220
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
221 add_dependencies (ldforge revision_check config_collection)
632
63e6243b880c - migrated to CMake again
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
222 install (TARGETS ldforge RUNTIME DESTINATION bin)

Mercurial Repository: ldforge

mercurial