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

29226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
16dffb3136 Merge topic 'cmConditionEvaluator-minor-cleanup' 
e7d5c142 cmConditionEvaluator: Remove superfluous spaces in expressions
 2015-07-28 10:08:48 -04:00
Brad King
eda29e6632 Merge topic 'ctest-add_subdirectory-crash' 
64821e8a ctest: fix add_subdirectory() crash
 2015-07-28 10:08:46 -04:00
Brad King
eb2b23e0d9 Merge topic 'cmake-install-dependencies-option' 
068e7962 CMake: Add CMake_INSTALL_DEPENDENCIES option
 2015-07-28 10:08:44 -04:00
Brad King
be938ab3f8 Merge topic 'cmake-gui-install-plugin' 
42f0155b cmake-gui: Install Qt5 Windows platform plugin
 2015-07-28 10:08:42 -04:00
Brad King
2a2a560125 Merge topic 'refactor-ninja-command-exporter' 
cd530df8 cmNinjaTargetGenerator: Factor out compile command exporter
 2015-07-28 10:08:40 -04:00
Brad King
24dd88d156 Merge topic 'fortran-parser-updates' 
ecca8fd9 cmFortranParser: Port to bison 3
eebe732b cmFortranParser: Factor out of cmDependsFortran
fd194458 cmDependsFortran: Simplify storage of preprocessor definitions
295480b9 cmDependsFortran: Move FindIncludeFile method into parser class
98b9645b Rename Fortran parser infrastructure to drop "Depends" prefix
096dd3c9 cmDependsFortranLexer: Remove trailing blank line
 2015-07-28 10:08:37 -04:00
Brad King
dce1b2991c Merge topic 'emacs-mode-updates' 
5593f28f cmake-mode.el: Derive cmake-mode from prog-mode
41d6044b cmake-mode.el: Add font-lock for keywords and variables
7987d985 cmake-mode.el: Rename function to be consistent
63de609e cmake-mode.el: Use `rx' for regexps
9d5082b2 cmake-mode.el: Minor clean-up
 2015-07-28 10:08:35 -04:00
Nils Gladitz
35fb0bb8c0 Ninja: Make import libraries BYPRODUCTs instead of regular OUTPUTs 
The MSVC linker may update a binary without touching the associated
import library.

Making the import library a BYPRODUCT prevents the linker from
unnecessarily rerunning when the import library does not get regenerated
as previously expected.
 2015-07-28 14:02:47 +02:00
Kitware Robot
9e29319447 CMake Nightly Date Stamp 2015-07-28 00:01:06 -04:00
Stephen Kelly
57f03e59ba Port some of the cmExportFileGenerator API to cmGeneratorTarget. 
Enough to make it more possible to move GetLinkInterface
to cmGeneratorTarget.
 2015-07-27 21:59:03 +02:00
Stephen Kelly
57ab0f70b5 Port cmExportBuildFileGenerator to cmGeneratorTarget. 2015-07-27 21:59:03 +02:00
Stephen Kelly
570938cbfd cmExportTryCompileFileGenerator: Create cmGeneratorTargets. 
This is not a deprecated behavior, but only requires IMPORTED targets
be made.
 2015-07-27 21:59:03 +02:00
Stephen Kelly
ec38e4c84f Move GetFullPath to cmGeneratorTarget 2015-07-27 21:59:02 +02:00
Stephen Kelly
dfb025bf12 Move GetLocationForBuild to cmGeneratorTarget. 2015-07-27 21:58:50 +02:00
Stephen Kelly
9f2dca805c Move GetLocation to cmGeneratorTarget. 2015-07-27 21:58:50 +02:00
Stephen Kelly
c7a8e74b8c Always access target location from a cmGeneratorTarget instance. 2015-07-27 21:58:50 +02:00
Stephen Kelly
5b60eaf619 cmTarget: Restore the ImportedGetLocation method. 
It was removed in commit f154475b (cmTarget: Refactor GetLocation
API, 2014-03-08), but it is more readable for targets we know are
imported.
 2015-07-27 21:58:50 +02:00
Stephen Kelly
50b17a6112 cmIncludeCommand: Populate the cmGeneratorTargets in deprecated path. 2015-07-27 21:58:50 +02:00
Stephen Kelly
ba26685882 cmTarget: Create cmGeneratorTargets before reading deprecated LOCATION. 
The intention is to move generation-semantic cmTarget API to cmGeneratorTarget
and then use the latter for generator expressions.

This means that each time we read a deprecated LOCATION property, we have to
clear and re-populate the container.  That must be done each time because the
result can change through the configure process, which is why this is
deprecated in the first place.
 2015-07-27 21:58:49 +02:00
Stephen Kelly
5ab3a94651 cmTarget: Inline GetLocation into deprecated callers. 2015-07-27 21:58:49 +02:00
Stephen Kelly
496f4cd07d cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc. 
Add cmGeneratorTargets as needed in the QtAutomoc processing.
 2015-07-27 21:58:49 +02:00
Stephen Kelly
de80993a20 cmGlobalGenerator: Create cmGeneratorTargets earlier. 2015-07-27 21:58:49 +02:00
Stephen Kelly
611220f77a cmTarget: Use reliable test for CMP0024 and CMP0026 OLD. 
Check whether the Makefile is fully configured instead of checking
whether generator targets exist.
 2015-07-27 21:58:49 +02:00
Stephen Kelly
bbad6ba537 cmLocalGenerator: Remove unused AddCustomCommandToCreateObject method. 2015-07-27 21:58:48 +02:00
Stephen Kelly
e4dc83ade5 cmLocalGenerator: Remove unused AddBuildTargetRule method. 2015-07-27 21:58:47 +02:00
Stephen Kelly
72f43fa13d cmLocalGenerator: Remove CreateCustomTargetsAndCommands method. 
It loops over cmGeneratorTargets, but at the point it is called, there are no
cmGeneratorTargets.  This must be dead code.
 2015-07-27 21:57:29 +02:00
Stephen Kelly
58811998fb cmGlobalGenerator: Add global targets at the end of Configure. 
Rather than at the start of Generate.
 2015-07-27 21:57:28 +02:00
Stephen Kelly
57a69f9341 cmGlobalGenerator: Extract method to create generator objects. 2015-07-27 20:09:39 +02:00
Stephen Kelly
0e0258c8b9 cmGlobalGenerator: Split creation of generator object from initialization. 2015-07-27 20:09:38 +02:00
Stephen Kelly
a8e5d838ed cmCPackPropertiesGenerator: Require cmLocalGenerator in API. 2015-07-27 20:09:38 +02:00
Stephen Kelly
d568eefe10 cmCustomCommandGenerator: Require cmLocalGenerator in API. 2015-07-27 20:09:38 +02:00
Sebastian Schuberth
e7d5c142c6 cmConditionEvaluator: Remove superfluous spaces in expressions 2015-07-27 17:24:59 +02:00
Brad King
59f4d9e85c Merge branch 'ctest-add_subdirectory-crash' into release 2015-07-27 11:15:50 -04:00
Ben Boeckel
64821e8a40 ctest: fix add_subdirectory() crash 
The directory is at args[0], not args[1].  Introduced in commit
v2.6.0~489 (... 5889 ... tests are not found in some cases when using
add_subdirectory ..., 2008-01-18).
 2015-07-27 11:14:51 -04:00
Konstantin Podsvirov
068e7962bb CMake: Add CMake_INSTALL_DEPENDENCIES option 
By default this option is ON.  Turn OFF to disable installing runtime
3rd-party dependencies.
 2015-07-27 10:30:41 -04:00
Konstantin Podsvirov
42f0155bb9 cmake-gui: Install Qt5 Windows platform plugin 
Qt5 requires a platform-specific runtime-loaded plugin.  We already
install it for OS X.  Install it for Windows too.
 2015-07-27 10:21:10 -04:00
Brad King
cd530df88f cmNinjaTargetGenerator: Factor out compile command exporter 2015-07-27 09:54:07 -04:00
Brad King
ecca8fd908 cmFortranParser: Port to bison 3 
Use %-directives to specify the scanner/lexer arguments and update the
yyerror signature.  Reduce the list of post-bison modifications needed.
 2015-07-27 09:45:36 -04:00
Brad King
eebe732bb6 cmFortranParser: Factor out of cmDependsFortran 
Move the main parser class and method implementations out of
cmDependsFortran.cxx and into separate source files.
 2015-07-27 09:45:36 -04:00
Brad King
fd19445802 cmDependsFortran: Simplify storage of preprocessor definitions 
Collect the original preprocessor definitions in a std::set<> so that
it can be copied directly by cmFortranParser's constructor instead of
making a copy on the stack.
 2015-07-27 09:45:35 -04:00
Brad King
295480b923 cmDependsFortran: Move FindIncludeFile method into parser class 
This drops the only awareness of cmDependsFortran that cmFortranParser
needed.
 2015-07-27 09:45:35 -04:00
Kitware Robot
98b9645bce Rename Fortran parser infrastructure to drop "Depends" prefix 
The parser can be re-used outside cmDependsFortran or the cmDepends
class hierarchy so drop the "Depends" from its name:

 rename 's/DependsFortran([A-Za-z0-9_])/Fortran$1/' Source/*.*
 sed -i 's/DependsFortran\([A-Za-z0-9_]\)/Fortran\1/g' Source/*.*
 sed -i 's/FortranInternals/DependsFortranInternals/g' Source/*.*

Also manually fix Source/CMakeLists.txt source file ordering.
 2015-07-27 09:45:35 -04:00
Brad King
096dd3c963 cmDependsFortranLexer: Remove trailing blank line 2015-07-27 09:45:35 -04:00
Roy Crihfield
5593f28fac cmake-mode.el: Derive cmake-mode from prog-mode 
Emacs 24 and above support a generic "prog-mode" to simplify definition
of programming modes.  Derive "cmake-mode" from it since we are a
programming mode.
 2015-07-27 09:40:54 -04:00
Roy Crihfield
41d6044bcf cmake-mode.el: Add font-lock for keywords and variables 
Control flow keywords will now be highlighted as such.  Variable names
will be also be recognized.  Adjust function name highlighting to work
in places other than the start of a line.
 2015-07-27 09:40:07 -04:00
Roy Crihfield
7987d9857e cmake-mode.el: Rename function to be consistent 
unscreamify-cmake-buffer => cmake-unscreamify-buffer

While at it, wrap the operation in (save-excursion).
 2015-07-27 09:39:42 -04:00
Roy Crihfield
63de609ef1 cmake-mode.el: Use `rx' for regexps 
This allows the keywords be defined in a list and reused in different
regexps.
 2015-07-27 09:39:09 -04:00
Roy Crihfield
9d5082b26e cmake-mode.el: Minor clean-up 
Superficial changes to use more conventional Emacs Lisp idioms.
 2015-07-27 09:38:31 -04:00
Brad King
280dde34dd Merge topic 'trace-expand' 
594bafe5 cmake: add --trace-expand option
 2015-07-27 09:31:22 -04:00
Brad King
0679c73b6e Merge topic 'drop-aix-release-scripts' 
10f20652 Utilities/Release: Drop IBM AIX release scripts
 2015-07-27 09:31:20 -04:00