Commit Graph

186 Commits

Author SHA1 Message Date
dt
fba7d76936 Canceling the wizard for a new cmake build configuration still created.
Made virtual newBuildConfiguration return a bool
2009-09-23 15:00:02 +02:00
dt
f291b669c3 Actually watch all the project files of a CMake project.
And react to changes to one of them.
2009-09-14 16:09:17 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
dbe5a6f34b Rework the project settings.
This has still a few missing things, but this enough to start getting
some feedback. Missing are non qt projects, a solution for the
runconfiguration, a missing black line between the treeview on top and
the project settings at the bottom. Some flickering with removing/adding
widgets to the QScrollArea and not showing the expanded widget if the
Details button is right at the bottom.
2009-08-06 15:31:32 +02:00
dt
e524f52477 Allow restoreSettings() to fail,
E.g. cmake pops up a wizard then, the running of cmake can fail though.
Now you don't end i[ with a empty project then. The error reporting in
that case is not yet optimal.
2009-07-03 16:46:01 +02:00
dt
40ff6ab2c4 Make msvc and cmake play together.
Note: This requires a cvs cmake and is not fully tested yet. This adds a
few missing pieces, so now opening new never built projects without a
.user file on systems with just one VS installation should work.
2009-07-02 16:44:51 +02:00
dt
7debdc2b75 Add all cmake files to the project tree
That is if using a cmake that outputs enough information. The necessary
patch for that was commited to cmake's cvs recently by Alexander
Neundorf.

Task-Nr: 250399
2009-06-30 17:38:27 +02:00
dt
2d65dec3e9 Add a toolChainType() method to the ApplicationRunConfiguration.
Best effort only though. This can make detection in the debugger which
engine should be used easier.

Task-Nr: 256161
2009-06-17 19:06:17 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
dt
0bda19a099 Add the ability to set a build environment also for CMake projects.
Note: as for qt projects, this is also used for running. And we don't
use it for running cmake yet.
2009-05-27 14:58:02 +02:00
dt
72f5be29a2 Support multiple buildconfigurations with cmake
We didn't support having different build directories.

Task-Nr: 251632
2009-05-18 18:07:52 +02:00
dt
84ee1653f4 Allow changing the build directory, and reparse.
Task:  250418

This also moves us closer to supporting multiple build configurations
properly.
2009-04-20 17:59:36 +02:00
dt
3b6d8b8f4d Add the ability to add Runconfigurations for cmake-targets we know about
Task: 250415
2009-04-06 17:01:26 +02:00
dt
0a2df32654 Pop up a dialog if the CMakeCache.txt changes.
Rerun cmake and reparse the file. Add new files to the tree, remove old
ones from th tree. Add/removing targets should also work.
2009-03-26 17:36:58 +01:00
Thorbjørn Lindeijer
78d603adec Use the make command defined by the tool chain
For now only for GenericProject, since the CMakeProject doesn't have the
right tool chain set on Windows yet.

Reviewed-by: dt
2009-03-18 14:35:35 +01:00
Thorbjørn Lindeijer
93b3dda602 Fixed member variable prefix to be in line with coding standards 2009-03-18 12:20:06 +01:00
dt
ef1693e9a3 Fixes: Add a smarter cmake open project wizard.
Details:  That fixes a few bugs, while still having a few missing
things. Don't allow the user to set a shadow build directory, if there
is already a in source build. Detect if a cbp file is already existing
and recent enough, don't rerun cmake then. Ensure that the user runs
cmake with the cbp generator on opening the project. Show the output of
the cmake generator while running. Remove the unecessary cmake step.
2009-03-09 18:13:19 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
dt
c6a02170b9 Fixes: Move Buildparser to the projectexplorer, use in cmakeplugin
Details:  This enables us to parse the build errors correctly.
          The makesteps of the qt4project and cmakeproject have some
          code dupliaction, which could be refactored. And the code
          to find out the correct build parser could probably also
          be done better, but we are now parsing the build output for
          cmake.
2009-02-16 13:12:12 +01:00
dt
04805e0a9e Fixes: Use the toolchain classes int the cmake plugin.
Details:  We now get the system includes and system defines.
2009-02-11 12:16:36 +01:00
dt
e8e2e4f45d Fixes: Progress to the cmake plugin
Details:  Add a dialog asking for command line options and build
directory. This dialog pops up if you don't have a .user file. Note,
though that it also pops up if there is already a in source build.
(The build directory lineedit should be read only then.)
The cmake button in that dialog and the output pane need more polish to
make them better. With those changes you can now build and run marble
from Qt Creator. (For marble you need to pass a few options to cmake.)

Also add a configuration page to the Tools/Options dialog, where you can
specify the cmake executable path.

And add a class which runs cmake in the background to find out which
version and wheter that cmake version has Qt Creator generator. (Which I
did begin to write.)
2009-01-23 16:57:38 +01:00
dt
db20c44d40 Fixes: Add a settings page to the cmake plugin.
Details:  There's a linedit on there, we restore and save the settings,
only thing missing is actually using it.
2009-01-21 16:25:21 +01:00
Thorbjørn Lindeijer
0728e78afb Reintroduced a way to edit project dependencies
Dependencies between projects can now be edited in the Projects mode.
You can simply check for each project the projects that it depends on,
and they will be built first. A message box pops up when you try to
create a circular dependency.

Could use some testing.
2009-01-16 16:44:25 +01:00
Fred Emmott
a4624993b9 fill in project name for CMake projects 2009-01-15 14:48:28 +00:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
dt
0b21f2898f Fixes: Various stuff in the cmake project.
Details:  Not yet usable, but at least you get a list of build targets now.
2009-01-12 15:10:33 +01:00
dt
3ba192af7e Merge branch '0.9.1-beta' 2008-12-17 14:21:03 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
dt
c70c7ac29c Fixes: Create a cbp file if we didn't find one, create All target
Task:     -
RevBy:    -
AutoTest: -
Details:  For now create only one build configuration "AllTargets",
build only the "all" target. Create runconfigurations for all targets
with option type=4
2008-12-12 17:22:02 +01:00
dt
7d4dab15a5 Fixes: Some running support for cmake
Task:     -
RevBy:    -
AutoTest: -
Details:  Note: I need to refactor the code significantly, i'm more or
less convinced that one build configuration per target is wrong.
We probably want one build configuration per build directory and instead
build all targets that we are interested then in the makestep.
This means we won't have any cmake support for the beta.
2008-12-09 14:13:29 +01:00
dt
e503e1e4e9 Fixes: Parse all the targets.
Task:     -
RevBy:    -
AutoTest: -
Details:  (Only outputs them via qDebug().)
2008-12-08 12:27:25 +01:00
dt
00da0ea34b Fixes: Seperate parsing the cbp file into a seperate class.
Details:  Makes the code look better.
2008-12-02 17:56:21 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
hjk
f61e8672db more cosmetic changes 2008-12-02 14:09:21 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00