Alex Neundorf
678e124481
Only enable the automoc test after checking that Qt4 works
...
On some systems which contribute nightly builds there were strange
errors which seemed to hint that the installed Qt4 is not usable/
not usable with this compiler. So first check whether it works,
and only if this was successful, enable the test.
Alex
2011-08-18 00:16:02 +02:00
Alex Neundorf
71c29d11b3
Fix bootstrap test with automoc
...
Alex
2011-08-17 17:08:50 +02:00
Alex Neundorf
afb3edc181
Fix warnings
...
Alex
2011-08-17 00:49:12 +02:00
Alex Neundorf
add30e9008
Fix build: non-void function must return a value
...
Alex
2011-08-17 00:39:21 +02:00
Alex Neundorf
7e6d84568c
Automoc.cmake is not needed anymore
...
(actually I thought I had already removed it again)
Alex
2011-08-17 00:04:47 +02:00
Alex Neundorf
2963d0b078
Fix logic which decides when to execute automoc test
...
Alex
2011-08-16 23:48:01 +02:00
Alex Neundorf
77a5c6e0d8
Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC
...
Alex
2011-08-16 22:05:33 +02:00
Alex Neundorf
bf8ef778a3
Add a test for automoc
...
The files are taken from the Qt examples. They are BSD licensed, so it
should be fine. I only edited main.cpp to use both widgets.
Alex
2011-08-16 02:13:26 +02:00
Alex Neundorf
d045fd4ec5
Nicer progress message for the automoc target
...
Alex
2011-08-16 02:00:36 +02:00
Alex Neundorf
50cd6cef92
Move automoc processing from add_executable/library to cmGlobalGenerator
...
Now automoc is enabled by setting the AUTOMOC target property to true,
instead of using the AUTOMOC keyword in add_executable() or add_library()
Alex
2011-08-16 01:45:05 +02:00
Alex Neundorf
cbaac2a587
Remove trailing whitespace
...
Alex
2011-08-16 01:44:13 +02:00
Alex Neundorf
c27607baf8
Refactor SetupAutomocTarget() so it can be run after creating the target
...
This makes it easier to move it from InitialPass() to some other
location, e.g. FinalPass() or something else.
Alex
2011-08-16 01:27:30 +02:00
Alex Neundorf
24d9b7d745
Remove trailing whitespace
...
Alex
2011-08-16 01:26:02 +02:00
Alex Neundorf
58b7fe6545
Use cout instead of printf()
...
Alex
2011-08-14 17:17:01 +02:00
Alex Neundorf
72caf4d178
Add the generated automoc.cpp file to the cleaned files
...
Alex
2011-08-14 17:06:34 +02:00
Alex Neundorf
ddb517d014
Color output when running moc
...
Alex
2011-08-14 16:43:04 +02:00
Alex Neundorf
93032953af
Initialize verbose based onb the env.var.
...
Alex
2011-08-14 15:58:09 +02:00
Alex Neundorf
ace121534d
Move code for parsing a cpp-file from the big loop to separate function
...
Alex
2011-08-14 15:58:09 +02:00
Alex Neundorf
735a5bb321
Fix line lengths
...
Alex
2011-08-14 15:58:09 +02:00
Alex Neundorf
83b730cd1a
Add AUTOMOC to the add_library() command
...
Alex
2011-08-14 15:58:08 +02:00
Alex Neundorf
126c6ead77
Add the cmake module required currently for automoc
...
Alex
2011-08-14 15:58:00 +02:00
Alex Neundorf
de91feb367
Remove the need to check for .h/.cxx during buildtime
...
Instead it now relies on cmake time to put that information
correctly into AutomocInfo.cmake
Alex
2011-08-14 15:53:50 +02:00
Alex Neundorf
d65689a3bd
Add actual automoc code from automoc
...
It already works :-)
Needs more refactoring, e.g. using the cmake facilities to turn a string
into a vector etc.
Also still missing is the part which creates the custom target.
Alex
2011-08-14 15:53:38 +02:00
Alex Neundorf
d1c0a5fce6
Start implementing skeleton for automoc in cmake
...
Alex
2011-08-14 15:45:13 +02:00
Alex Neundorf
a65011baf1
Start work on automoc: add empty cmQtAutomoc class
...
Alex
2011-08-07 12:02:46 +02:00
KWSys Robot
2c14a176bb
KWSys Nightly Date Stamp
2011-08-07 00:14:22 -04:00
KWSys Robot
955d5133ab
KWSys Nightly Date Stamp
2011-08-06 00:14:05 -04:00
KWSys Robot
ec4e4ce695
KWSys Nightly Date Stamp
2011-08-05 00:13:08 -04:00
Brad King
5f0eba49f2
KWSys: Avoid conversion warning in SystemTools::GetTime
...
Convert struct timeval members to double explicitly to avoid a GCC
warning with -Wconversion.
2011-08-04 08:30:05 -04:00
KWSys Robot
f31def8c62
KWSys Nightly Date Stamp
2011-08-04 00:10:14 -04:00
Brad King
74e1156bc2
KWSys: Simplify SystemTools::GetTime implementation ( #12261 )
...
We already use GetSystemTimeAsFileTime() and gettimeofday()
unconditionally on supported Windows and non-Windows platforms,
respectively. Remove outdated portability complexity.
2011-08-03 14:50:04 -04:00
KWSys Robot
14e54c4c44
KWSys Nightly Date Stamp
2011-08-03 00:14:04 -04:00
David Cole
80ef23d83f
Merge topic 'CodeBlocksIncludeDirsAndDefines'
...
e2e8c0a
Also put builtin include dirs into CodeBlocks project file
92c0dc5
Remove useless line of code
a5683f8
Patch by Campbell Barton: puts definitions into C::B project file
2011-08-02 15:11:58 -04:00
David Cole
6a11727154
Merge topic 'FindGIFAndFreetypeCleanupAndEnhancements'
...
81a70c6
Add basic version check for giflib
2462f65
FindGif: add giflib4 as one more name for the library under Windows
f97620e
FindGIF/FindFreetype.cmake: remove standard search paths from find-calls
7c38523
Strip trailing whitespace
2011-08-02 15:11:53 -04:00
David Cole
737be8f6f6
Merge topic 'FindPostgresqlImprovements'
...
825c457
FindPostgreSQL: fix PATH_SUFFIXES, better output for FPHSA
e159bb5
Mark the results from find() as advanced
da1bdaf
Use FPHSA(), remove unnecessary stuff and don't recommend link_directories()
217d068
More PATH_SUFFIXES for finding Postgresql and also search catalog/pg_type.h
2011-08-02 15:11:45 -04:00
David Cole
bd54141d5d
Merge topic 'fix-11866-add-watcom-sys-libs'
...
ff59716
Watcom: Use correct args for execute_process call (#11866 )
80769cd
Add Watcom support to InstallRequiredSystemLibraries (#11866 )
2011-08-02 15:11:35 -04:00
David Cole
11ca173731
Merge topic 'doc-WIN32-cygwin'
...
1f641de
Documentation: WIN32 not defined on Cygwin (#12334 )
2011-08-02 15:11:20 -04:00
David Cole
e9a6d86d91
Merge topic 'ExcludeCMakesFilesFromCodeBlocksProject'
...
f32f6f0
Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110 )
2011-08-02 15:11:01 -04:00
David Cole
ab24bdeecc
Merge topic 'cpack-nsis-multi-installs'
...
e6d2bcf
CPack/NSIS: Fix reinstall and multiple install issues when using components.
2011-08-02 15:10:47 -04:00
David Cole
abc8586716
Merge topic 'fix-12299-add-vs10-scc-support'
...
05ddfbf
VS10: Add SCC support
2011-08-02 15:10:31 -04:00
David Cole
b01167161c
Merge topic 'fix-12245-add-wlib--c-flag'
...
a0974ae
Watcom: Add -c flag to wlib calls (#12245 )
2011-08-02 15:10:21 -04:00
David Cole
7824885960
Merge topic 'adjust-path-for-all-generators-test'
...
0baf565
Ensure libgmp-10.dll is in the PATH for CMakeTestAllGenerators
2011-08-02 15:10:15 -04:00
David Cole
330577ce87
Merge topic 'fix-updategit-test'
...
0375865
Fix machine-specific UpdateGIT test failures
2011-08-02 15:10:12 -04:00
David Cole
86bae62bd1
Merge topic 'fix-8707-add-vs-globals'
...
df95772
Add support for Visual Studio project-specific globals (#8707 )
2011-08-02 15:10:09 -04:00
David Cole
7ef2f53d02
Merge topic 'qt4-use-check-cxx-symbol'
...
de30173
Remove C compiler requirement from FindQt4.cmake
2011-08-02 15:10:05 -04:00
David Cole
996eb50364
Merge topic 'RemoveDebugOutput'
...
6b71bf8
Remove debug output from CheckSymbolExists
2011-08-02 15:10:01 -04:00
David Cole
2444d6f55e
Merge topic 'split-stdout-stderr'
...
a343bc1
RunSingleCommand: Avoid assignment in condition
642f100
RunSingleCommand: Add a OUTPUT_NORMAL flag.
856a9e4
RunSingleCommand: Replace verbose boolean with enum
4096066
RunSingleCommand: Fix indentation
2011-08-02 15:09:57 -04:00
David Cole
39faba7e30
Merge topic 'cmSystemTools-whitespace'
...
acd2f84
cmSystemTools: Remove trailing whitespace
2011-08-02 15:09:53 -04:00
David Cole
be3ac14ac7
Merge topic 'add-flag-detection-regex'
...
b7f3f7c
Add fail regex to detect supported warning flags correctly.
2011-08-02 15:09:49 -04:00
David Cole
c6051b7abd
Merge topic 'library-multiarch-issue-12326'
...
317d077
multiarch: Treat lib/<arch> as implicit link dir (#12326 )
2011-08-02 15:09:45 -04:00