12276 Commits

Author SHA1 Message Date
David Cole
eb02acb695 VS10: Avoid unnecessary rebuilds for custom commands
Thanks to James Bigler for pointing this out on the
cmake-developers mailing list...
2011-08-18 16:51:52 -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
43869188af Fix line length
Alex
2011-08-18 18:39:05 +02:00
KWSys Robot
d7184e0e4d KWSys Nightly Date Stamp 2011-08-18 00:13:09 -04:00
Alex Neundorf
71c29d11b3 Fix bootstrap test with automoc
Alex
2011-08-17 17:08:50 +02:00
KWSys Robot
721133dc45 KWSys Nightly Date Stamp 2011-08-17 00:10:16 -04: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
David Cole
7b044105ce Merge topic 'add-vs9-midl-inc-dirs'
ac22e2a VS9: Add include_directories to midl command lines
2011-08-16 17:03:15 -04:00
David Cole
674be27a7f Merge topic 'WriteConfigVersionFile_2TemplateFiles'
c9761de Improve documentation for WriteBasicConfigVersionFile.cmake
208bb90 Set UNSUITABLE instead of not COMPATIBLE
bb03c2d Really fix copyright notice
d50a61a Fix copyright notice
4ba09bc Add some tests for write_basic_config_version_file()
02b1e4b Add example to documentation
d216a67 Provide macro write_basic_config_version_file()
2011-08-16 17:03:00 -04:00
David Cole
47a8d4f22c Merge topic 'fix-10941-correct-comments'
edcdfea Documentation: Fix comments in the source code (#10941)
2011-08-16 17:02:52 -04:00
David Cole
b38bf726f4 Merge topic 'enable-parallel-xcode-builds'
312d68d Xcode: Rearrange CMakeReRun to enable parallel builds
2011-08-16 17:02:48 -04:00
David Cole
522c263d9d Merge topic 'fix-imported-target-depend-crash'
8ee9bbb Do not crash when an imported target depends on a missing target
2011-08-16 17:02:43 -04:00
David Cole
e1d4a73be0 Merge topic 'fix-12259-quote-commas-for-xcode'
d87eb35 Xcode: Quote ',' in Xcode string values (#12259)
2011-08-16 17:02:38 -04:00
David Cole
0923610b6d Merge topic 'fix-11746-sort-failed-tests-output'
4575ed9 Fix line too long style violation
ba4886b CTest: print failed tests in index order (#11746)
2011-08-16 17:02:23 -04:00
David Cole
a772f21a7d Merge topic 'intel_fortran_vs2010'
3c53fbb Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
2011-08-16 17:01:33 -04:00
David Cole
6d5819ca6c Merge topic 'fix-8707-add-vs-globals'
37d8602 Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
6c72d25 Initial support for Intel Fortran VS2010.
2011-08-16 17:01:28 -04:00
Alex Neundorf
77a5c6e0d8 Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC
Alex
2011-08-16 22:05:33 +02:00
KWSys Robot
2bfd55a7c6 KWSys Nightly Date Stamp 2011-08-16 00:14:06 -04: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
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