kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
28,924 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

28924 Commits

Author SHA1 Message Date
Sean Brennan cfd23d3f1f FindMPI: Extend Intel-MPI 5+ workaround for recent GCCs 
Extend the workaround added by commit v3.2.0-rc1~278^2 (FindMPI:
Workaround Intel MPI 5.0.1 exit code problem, 2014-12-04) with an
additional/alternate keyword to recognize the case with recent GCCs.
 2015-07-10 08:55:39 -04:00
Brad King 92b3bd50fe Merge topic 'autorcc-qt-5.1' 
9a271e13 cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
 2015-07-10 08:51:24 -04:00
Brad King 1dd96df94d Merge topic 'OUTPUT_NAME-genex' 
809159c9 Add generator expression support to OUTPUT_NAME target property
9a1ef0dc Help: Improve OUTPUT_NAME documentation formatting
 2015-07-10 08:51:21 -04:00
Brad King 42d0420649 Merge topic 'factor-out-common-generator' 
fed5eb5b cmNinjaTargetGenerator: Use GetDefines method
eacacacd cmCommonTargetGenerator: Adopt GetDefines method
0837538e cmCommonTargetGenerator: Adopt GetFlags method
f4875bbd cmNinjaTargetGenerator: Add OX X framework flags
7891f5d7 cmMakefileTargetGenerator: Fix comment typo
73bfad72 cmNinjaTargetGenerator: Factor out AddIncludeFlags helper
6a56740e cmNinjaTargetGenerator: Add Fortran flag generation
058074d4 cmCommonTargetGenerator: Adopt GetFrameworkFlags
ab824018 cmCommonTargetGenerator: Adopt AppendFortranFormatFlags
0b22c0b8 cmCommonTargetGenerator: Adopt AddFortranFlags and friends
b2f51aef cmCommonTargetGenerator: Adopt Convert method
cdb5b657 cmCommonTargetGenerator: Adopt ModuleDefinitionFile member
beee7937 cmCommonTargetGenerator: Adopt GetFeature and friends
abfa5f2d cmCommonTargetGenerator: Adopt ConfigName member
9d41f6d8 cmLocalCommonGenerator: Adopt ConfigName member
a4a2518d cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessor
...
 2015-07-10 08:51:19 -04:00
Brad King 4b486ccb1b Merge topic 'move-command-line-escape-code' 
df97bea2 cmOutputConverter: Adopt command line escaping code
bb7eefe4 cmOutputConverter: Adopt EscapeWindowsShellArgument method
cedd6e65 cmLocalVisualStudio7Generator: Remove unused include
30faf20c cmLocalGenerator: Remove unused include
 2015-07-10 08:51:14 -04:00
Brad King ef39edc303 Merge topic 'FindIce-imported-targets' 
889b22e2 Help: Add notes for topic 'FindIce-imported-targets'
cd4d2e9c FindIce: document imported targets
748f1eae FindIce: create imported targets for components
 2015-07-10 08:51:12 -04:00
Brad King 2ffa8ae29c Merge topic 'compiler-feature-AppleClang-std-flags' 
228643af AppleClang: Use modern C++14 standard flags for Apple Clang 6.1
 2015-07-10 08:51:09 -04:00
Kitware Robot 9f9d26465f CMake Nightly Date Stamp 2015-07-10 00:01:06 -04:00
Brad King 9a271e1323 cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644) 
In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their
input changes, 2014-09-17) we added use of the rcc "--list" option.
Prior to Qt 5.2 this option was called just "-list", and the older name
is still supported by the newer tools.  Use the older name of the option
for compatibility with Qt 5.0 and 5.1.
 2015-07-09 13:02:07 -04:00
Robert Goulet 809159c9b7 Add generator expression support to OUTPUT_NAME target property 2015-07-09 11:48:10 -04:00
Brad King 9a1ef0dcfd Help: Improve OUTPUT_NAME documentation formatting 
Also link to its variants.
 2015-07-09 11:28:52 -04:00
Brad King fed5eb5b0e cmNinjaTargetGenerator: Use GetDefines method 
Simplify the per-source ComputeDefines implementation by getting
target-wide defines from GetDefines.  Technically this changes behavior
by no-longer de-duplicating/sorting defines from both the target and the
source, but this makes it consistent with the Makefile generator.  It
may also later help move target-wide defines into per-target compilation
rules.
 2015-07-09 10:15:08 -04:00
Brad King eacacacdce cmCommonTargetGenerator: Adopt GetDefines method 
Move the member up from cmMakefileTargetGenerator so it can be re-used
later by cmNinjaTargetGenerator.
 2015-07-09 10:10:25 -04:00
Brad King 0837538e46 cmCommonTargetGenerator: Adopt GetFlags method 
De-duplicate per-target flag computation in Makefile and Ninja target
generators.
 2015-07-09 10:06:24 -04:00
Brad King f4875bbdd6 cmNinjaTargetGenerator: Add OX X framework flags 
Teach ComputeFlagsForObject to add -F flags just like the Makefile
generator does.
 2015-07-09 10:04:10 -04:00
Brad King 7891f5d7e7 cmMakefileTargetGenerator: Fix comment typo 2015-07-09 10:04:00 -04:00
Brad King 73bfad72d3 cmNinjaTargetGenerator: Factor out AddIncludeFlags helper 
Factor an AddIncludeFlags method out of ComputeFlagsForObject just like
cmMakefileTargetGenerator has already.
 2015-07-09 09:59:25 -04:00
Brad King 6a56740e27 cmNinjaTargetGenerator: Add Fortran flag generation 
Make ComputeFlagsForObject consistent with the Makefile generator
in regard to Fortran flags.
 2015-07-09 09:54:56 -04:00
Brad King 058074d499 cmCommonTargetGenerator: Adopt GetFrameworkFlags 
Move the member up from cmMakefileTargetGenerator.
 2015-07-09 09:50:07 -04:00
Brad King ab8240189d cmCommonTargetGenerator: Adopt AppendFortranFormatFlags 
Move up from cmMakefileTargetGenerator.
 2015-07-09 09:50:07 -04:00
Brad King 0b22c0b815 cmCommonTargetGenerator: Adopt AddFortranFlags and friends 
Move AddFortranFlags, GetFortranModuleDirectory, and supporting members
up from cmMakefileTargetGenerator.
 2015-07-09 09:50:07 -04:00
Brad King b2f51aef0d cmCommonTargetGenerator: Adopt Convert method 
Move it up from cmMakefileTargetGenerator.
 2015-07-09 09:50:06 -04:00
Brad King cdb5b65752 cmCommonTargetGenerator: Adopt ModuleDefinitionFile member 
De-duplicate the ModuleDefinitionFile and AddModuleDefinitionFlag
members from the Makefile and Ninja target generators.
 2015-07-09 09:50:06 -04:00
Brad King beee793732 cmCommonTargetGenerator: Adopt GetFeature and friends 
De-duplicate the GetFeature, GetFeatureAsBool, and AddFeatureFlags
members from the Makefile and Ninja target generators.
 2015-07-09 09:50:06 -04:00
Brad King abfa5f2d1f cmCommonTargetGenerator: Adopt ConfigName member 
De-duplicate the member from the Makefile and Ninja target generators.
 2015-07-09 09:50:06 -04:00
Brad King 9d41f6d87b cmLocalCommonGenerator: Adopt ConfigName member 
De-duplicate the member from the local Makefile and Ninja generators.
 2015-07-09 09:50:06 -04:00
Brad King a4a2518dd4 cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessor 
Rename internal member from ConfigurationName to ConfigName to
match the ninja generator.
 2015-07-09 09:50:05 -04:00
Brad King e7dcdd1011 cmCommonTargetGenerator: Adopt basic target generator members 
De-duplicate the GeneratorTarget, Target, and Makefile members from the
local Makefile and Ninja generators.
 2015-07-09 09:50:05 -04:00
Brad King 001f9b3617 Add common base classes to Makefile and Ninja generators 
Provide a place to move functionality common to both.
 2015-07-09 09:50:05 -04:00
Brad King 889b22e2ca Help: Add notes for topic 'FindIce-imported-targets' 2015-07-09 09:48:15 -04:00
Brad King 6f6664f578 Merge topic 'FindXercesC-versioned-library' 
d3d4d627 FindXercesC: Find versioned library on Windows
 2015-07-09 09:17:25 -04:00
Brad King ab4b662832 Merge topic 'cpack-ifw-framework-version' 
ad5c76af CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION
 2015-07-09 09:17:23 -04:00
Brad King 5827d9a626 Merge topic 'eclipse-cygwin-paths' 
a672b16a Eclipse: Fix paths in target links on cygwin
 2015-07-09 09:17:22 -04:00
Brad King 3723fe94e6 Merge topic 'CheckCompilerFlag-do-not-use-FLAGS' 
a639689c Check*CompilerFlag: Revert to previous method used to pass flags (#15641)
 2015-07-09 09:17:19 -04:00
Brad King 6b4fccd1a6 Merge topic 'empty-LINK_LIBRARIES' 
7aa9e80e set_property: Fix crash when setting LINK_LIBRARIES to nothing
 2015-07-09 09:17:17 -04:00
Brad King 53f8ef66a5 Merge topic 'update-kwsys' 
65de27b8 Merge branch 'upstream-kwsys' into update-kwsys
42272a82 KWSys 2015-07-07 (8504e845)
 2015-07-09 09:17:14 -04:00
Brad King 228643af6d AppleClang: Use modern C++14 standard flags for Apple Clang 6.1 
The Apple Clang 6.1 compiler that comes with Xcode 6.3 is aware of the
modern -std=c++14 and -std=gnu++14 flags, so use them instead of the
"1y" flags.

Suggested-by: darkapostle@rule506.net
 2015-07-09 09:11:57 -04:00
Roger Leigh cd4d2e9c79 FindIce: document imported targets 2015-07-09 11:33:56 +01:00
Daniel Pfeifer 748f1eaee3 FindIce: create imported targets for components 2015-07-09 11:32:36 +01:00
Kitware Robot aa550e04f3 CMake Nightly Date Stamp 2015-07-09 00:01:06 -04:00
Brad King 6c16bd5388 Merge branch 'cpack-ifw-framework-version' into release 2015-07-08 16:08:58 -04:00
Konstantin Podsvirov ad5c76af64 CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION 
This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1
(CPackIFW: Add QtIFW 2.0 support, 2015-04-27).  We need to load the
CPackIFW module to initialize it if it is not set.
 2015-07-08 16:02:03 -04:00
Markus Grech a672b16a3a Eclipse: Fix paths in target links on cygwin 
Add a missing GetEclipsePath call to fix generation of incorrect paths
for target links in Eclipse CDT generator which caused Eclipse to be
unable to open files through such links.  Without this the generator
would generate invalid links for source files under "[Targets]", making
Eclipse unable to open them.  The old links looked like
"C:/cygdrive/c/...", while new links correctly are "C:/...".
 2015-07-08 14:29:11 -04:00
Roger Leigh d3d4d6275a FindXercesC: Find versioned library on Windows 2015-07-08 18:08:20 +00:00
Brad King d805767545 Merge branch 'empty-LINK_LIBRARIES' into release 2015-07-08 13:27:29 -04:00
Brad King 7aa9e80e35 set_property: Fix crash when setting LINK_LIBRARIES to nothing 
We use a special dedicated structure to store the LINK_LIBRARIES target
property.  Do not try to construct a string from a NULL value.  Instead
leave the property structure empty when no value is given.

Reported-by: Ghyslain Leclerc <ghleclerc@gmail.com>
 2015-07-08 13:23:16 -04:00
Brad King e7c33efa15 Merge branch 'CheckCompilerFlag-do-not-use-FLAGS' into release 2015-07-08 09:59:42 -04:00
Brad King a639689c16 Check*CompilerFlag: Revert to previous method used to pass flags (#15641) 
Since commit v3.3.0-rc1~397^2 (Check*CompilerFlag: Refactor method used
to pass flags, 2015-02-24) these check modules pass the flags to the
compiler front-end during linking as well as during compilation.  This
breaks checks for flags like '-x c++' that are meant only for the
compilation step.  Revert the change and add a test covering a
compiler-only flag.
 2015-07-08 09:55:16 -04:00
Brad King c66d232c9c Merge topic 'string-append' 
2b18cdca string: add APPEND subcommand
 2015-07-08 09:21:52 -04:00
Brad King 0d457c3199 Merge topic 'preserve-generator-on-failure' 
3b60232e cmake: Preserve cached CMAKE_GENERATOR when an error occurs (#15640)
 2015-07-08 09:19:14 -04:00