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

12011 Commits

Author SHA1 Message Date
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
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