kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
16,882 Commits 1 Branch 14 Tags
Commit Graph

11835 Commits

Author SHA1 Message Date
Stephen Kelly
7bf2c1aa3e Create moc files in the current binary dir, not the top level. 2011-08-25 21:39:51 +02:00
David Cole
920a046015 QtAutomoc: Eliminate compiler warning 2011-08-19 14:18:11 -04:00
Alex Neundorf
e78ce44b35 Fix automoc with VS builds: apply patch from Bill 
This patch moves the creation of VS GUIDs from the final pass
to AddHelperCommands() and should fix the failing automoc tests
with VS.

Alex
 2011-08-18 19:35:41 +02:00
Alex Neundorf
71165e943e Silence warning in automoc: use long instead of int 
Alex
 2011-08-18 19:34:49 +02:00
Alex Neundorf
1879bcc09c Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out 
Alex
 2011-08-18 18:53:14 +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
77a5c6e0d8 Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC 
Alex
 2011-08-16 22:05:33 +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
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
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
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
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
David Cole
2c7b38afa6 Merge topic 'FeatureSummaryImprovements' 
b62349c FeatureSummary.cmake: update documentation
f366cf8 FeatureSummary.cmake: cosmetics
f407bb5 FeatureSummary.cmake: only higher TYPEs can override previous TYPEs
02d47ab FeatureSummary.cmake: error out when a REQUIRED package is missing
91a1527 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword
0671a02 FeatureSummary.cmake: remove "comment" field
aae13f4 Extend FeatureSummary: add PURPOSE of package and TYPE
 2011-08-02 15:09:41 -04:00
KWSys Robot
d8c1b44790 KWSys Nightly Date Stamp 2011-08-02 00:13:05 -04:00
Alex Neundorf
e2e8c0a412 Also put builtin include dirs into CodeBlocks project file 
Refactor code from CMakeFindEclipseCDT4.cmake so it can be used
alkso for CodeBlocks, and move it into new file
CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake.

Alex
 2011-08-02 01:46:39 +02:00
Alex Neundorf
92c0dc50fc Remove useless line of code 
Alex
 2011-08-02 01:05:24 +02:00
KWSys Robot
cbaf944568 KWSys Nightly Date Stamp 2011-08-01 00:13:34 -04:00
KWSys Robot
4d9874440a KWSys Nightly Date Stamp 2011-07-31 00:14:04 -04:00
KWSys Robot
55022455d0 KWSys Nightly Date Stamp 2011-07-30 00:14:02 -04:00
Brad King
1f641de4b8 Documentation: WIN32 not defined on Cygwin (#12334) 
Since commit 85c0a69a (Cygwin: Do not define 'WIN32', 2010-12-17) WIN32
is not defined on Cygwin.  Update documentation of the WIN32 variable
accordingly.
 2011-07-29 18:40:56 -04:00