Commit Graph

53 Commits

Author SHA1 Message Date
dt
adc7a7204b Use the environment specified for the current build configuration to
rebuild the cbp file

I think that makes sense, we'll see.
2009-05-27 14:58:11 +02:00
dt
14a79dad58 Simplfy API of CMakeOpenProjectWizard remove some left over QStringList
We don't call it with a list anymore, so make it just a QString
2009-05-27 14:58:07 +02: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
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
dt
d0159d7c7c Small tweaks to the cmake open project wizard.
Note: The use is now forced to run cmake. This is rather suboptimal, but
currently cancel doesn't do the correct thing so we prevent that.
2009-04-15 16:22:55 +02:00
dt
0a406dbe1f Add a makestep that cleans up
Make clean and rebuild all work.
2009-04-07 15:00:16 +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
ae1df70cfc Adds the source top level directory explicitly to the include paths.
It wasn't listed in the cbp file, so add it since cmake does that too.
2009-03-27 12:15:20 +01:00
dt
145c1fb94d Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-03-26 17:38:18 +01: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
mae
62dd2a5acb Compile without warnings 2009-03-26 15:33:32 +01:00
Thorbjørn Lindeijer
71aeac5915 Use completeBaseName instead of baseName where appropriate
Fixes issues with handling additional dots in the filename in many
places.

Task: 246390
2009-03-20 17:04:23 +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
dt
00951b6b96 More progress on the CMake plugin
Made the cmake plugin even more usable by implementing:
Pop up a wizard if there is a .user file but no .cbp file. (Fixes empty
project reported on irc.)
Pop up a wizard if the .cbp file is older then the CMakeLists.txt file,
thus reparsing the file. (Note: There is a bug that we need to actually
also check the last modified of all included files.)
Reparse the cbp file to add new RunConfigurations / delete no longer
existing RunConfigurations and update those that have changed.-
Show a nicer title in the Projects/RunConfiguration pane
2009-03-16 17:33:05 +01:00
dt
7fef10810a Fixes: All cmake projects use CMakeLists.txt as the name
Task:     246282
Details:  call setFolderName()
2009-03-13 15:46:30 +01:00
dt
3006495403 Fixes: Make opening complex projects 6 times faster.
Details:  Optimize addFileNodes and addFolderNodes. Probably has no
effect for qt4projectmanager.
2009-03-13 13:55:59 +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
dt
8897284189 Fixes: Show the CMakeLists.txt file in the navigation widget and completion
Task:     CMake support
Details:  No syntax highlighting
2009-03-03 19:03:39 +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
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
dt
f52a012924 Merge commit 'fred/cmake-build-directory' 2009-01-16 13:48:06 +01:00
dt
ad2fd37b85 Fixes: Probably this needs to be for windows.
Details:  I haven't checked, but according to the cmake sources I need to change this.
2009-01-16 13:47:40 +01:00
Fred Emmott
297bdb3c05 Run all commands in ./qtcreator-build/ when using the CMake plugin.
- avoid polution of the source.
- required for KDE apps.
2009-01-15 19:29:42 +00:00
Fred Emmott
ea2c57257c Run the project cmake command in a ./qtcreator-build directory. 2009-01-15 19:20:36 +00:00
dt
58a0724980 Fixes: Fix parseOption method to be robust 2009-01-15 16:06:37 +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
5c6c442883 Fixes: Add install target and don't create runconfigurations for targets without executable.
Details:  One step at a time.
2009-01-12 17:51:50 +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
d402ed2955 Fixes: Replace QTC_ASSERT with QT_ASSERT. 2008-12-17 15:51:48 +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
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
dt
f293f4d7ef Fixes: Whitespace to make hjk happy. 2008-12-09 14:33:09 +01:00
dt
b33cf9b4cd Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
2008-12-09 14:18:09 +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
hjk
342caa2141 some more whitespace changes 2008-12-09 11:07:24 +01:00
dt
942363913c Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts:
	src/plugins/qt4projectmanager/qtversionmanager.cpp
2008-12-08 12:47:15 +01:00
dt
83d5461c7f Fixes: Find the qplatformdefs.h file
Task:     -
RevBy:    -
AutoTest: -
Details:  Add the include path for qplatformdefs.h to the fot.
2008-12-08 12:44:28 +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
Roberto Raggi
d74ddb76b6 Protected m_dirty and m_projects with a mutex. 2008-12-08 10:45:27 +01:00
dt
440053f71e Fixes: Add the cmakestep and makestep to a buildconfigratuion.
Task:     -
RevBy:    -
AutoTest: -
Details:  Actually building only works on unix (since the generator is
hardcoded.) and make is called without any parameters which is wrong.
A lot is missing for basic build support, but this is a start.
2008-12-05 16:30:26 +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