11950 Commits

Author SHA1 Message Date
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
ec6982dc8c Disable any STATUS output in --find-package mode
Any STATUS output will be fed directly to the compiler, which
will not understand any status messages. Error messages
are fine, since they are errors and it is ok if the compiler
fails in such cases.

Alex
2011-08-16 00:40:59 +02:00
KWSys Robot
87fa807fd8 KWSys Nightly Date Stamp 2011-08-15 00:13:05 -04: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
KWSys Robot
0ee93a81cd KWSys Nightly Date Stamp 2011-08-14 00:12:36 -04:00
KWSys Robot
27c8b8b455 KWSys Nightly Date Stamp 2011-08-13 00:13:07 -04:00
David Cole
ac22e2a879 VS9: Add include_directories to midl command lines
Makes VS 7, 8 and 9 generators consistent with the VS 10
generator. Adds the "AdditionalIncludeDirectories" attribute
at the vcproj level so that all idl files inherit the /I
command line args.
2011-08-12 17:12:08 -04:00
KWSys Robot
65ba6da576 KWSys Nightly Date Stamp 2011-08-12 00:14:04 -04:00
Alex Neundorf
d3ae0fff7d Improve documentation for --find-package mode
Alex
2011-08-11 22:43:45 +02:00
KWSys Robot
975ef3ef1a KWSys Nightly Date Stamp 2011-08-11 00:14:04 -04:00
KWSys Robot
563e3f0e0a KWSys Nightly Date Stamp 2011-08-10 00:14:02 -04:00
Brad King
c04613a55d KWSys: __int64 and long long may be same type in specialization
For the specialization of hash<>(), the types long long and __int64
may be the same type. While the CMakeLists indicate that if __int64 is
a alias for another type the it will not be enabled, on mingw they
both appear to be the same type and enabled.

This patch only enable specialization for long long OR __int64 to
avoid the potential conflict.

Author: Bradley Lowekamp <blowekamp@mail.nih.gov>
Change-Id: I813a9ac008b296fab5a369c48e6dd5460fd0c035
2011-08-09 18:04:04 -04:00
Alex Neundorf
7690edffd9 Replace cmake::GetScriptMode() with GetWorkingMode()
GetWorkingMode() returns a new enum WorkingMode, which is one of
NORMAL_MODE, SCRIPT_MODE and FIND_PACKAGE_MODE.

Alex
2011-08-09 16:32:45 +02:00
KWSys Robot
4675f5d204 KWSys Nightly Date Stamp 2011-08-09 00:13:06 -04:00
Brad King
867c3dcd24 KWSys: Fix using long long and __int64 with hash_(set|map)
Added hash function for types long long and __int64, conditional on
detection by FundamentalType.

Author: Bradley Lowekamp <blowekamp@mail.nih.gov>
Change-Id: Ie273f55cd4387ca3dbbe00b9d96ad4935e456c9e
2011-08-08 08:50:07 -04:00
KWSys Robot
0e28009184 KWSys Nightly Date Stamp 2011-08-08 00:13:08 -04: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
David Cole
edcdfeae93 Documentation: Fix comments in the source code (#10941)
Previously, the comments had all been copied and pasted
and not fixed up... Now they are fixed up.
2011-08-04 19:03:24 -04:00
Johan Björk
312d68d5b1 Xcode: Rearrange CMakeReRun to enable parallel builds
by isolating the CMakeReRun steps to a ZERO_CHECK target, as
in the Visual Studio generators. Also, honor the value of
CMAKE_SUPPRESS_REGENERATION.
2011-08-04 16:31:45 -04:00
Brad King
8ee9bbbd0c Do not crash when an imported target depends on a missing target
Commit e01cce28 (Allow add_dependencies() on imported targets,
2010-11-19) forgot to check if the dependee exists before using it.
2011-08-04 15:36:32 -04:00
Johan Björk
d87eb350f6 Xcode: Quote ',' in Xcode string values (#12259) 2011-08-04 13:03:44 -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
Bill Hoffman
3c53fbb1f0 Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
For custom commands in VS2010 Fortran projects the INTDIR variable
is different than in the rest of the solution because Intel
fortran still uses the old VS project files even in VS2010. So,
we replace $(Configuration) directly in the project files. I have also
added a FortranOnly test that tests this feature and is run on any
generator that has Fortran abilities.
2011-08-03 17:24:43 -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
David Cole
4575ed9e2a Fix line too long style violation 2011-08-03 11:37:59 -04:00
David Cole
ba4886b717 CTest: print failed tests in index order (#11746)
This deterministic ordering makes it easier for a developer
comparing the ctest output of two test runs to see what changed
from run to run.

Thanks to Fraser Hutchison for the patch.
2011-08-03 10:48:43 -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