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

17085 Commits

Author SHA1 Message Date
Kitware Robot
3fae1f9265 CMake Nightly Date Stamp 2014-11-27 00:01:14 -05:00
Brad King
82582c96bd Merge topic 'break-command-strictness' 
d54617d0 break: Add policy CMP0055 to check calls strictly
bae604d9 Track nested loop levels in CMake language with a stack of counters
 2014-11-26 13:50:47 -05:00
Brad King
57a77fbe69 Merge topic 'ccmake-system-form' 
6b045c3b ccmake: Add CMAKE_USE_SYSTEM_FORM option to use libform instead of cmForm
 2014-11-26 10:37:51 -05:00
Kitware Robot
94c7ff9fef CMake Nightly Date Stamp 2014-11-26 00:01:14 -05:00
Gregor Jasny
d54617d006 break: Add policy CMP0055 to check calls strictly 
Reject break() without loop scope or any arguments.

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
 2014-11-25 14:14:20 -05:00
Gregor Jasny
bae604d9a8 Track nested loop levels in CMake language with a stack of counters 
It gets incremented while entering a loop block (e.g. foreach or while)
and gets decremented when leaving the block. Because scope borders for
example at function borders must be taken into account the counter is
put into a stack. With every new scope an empty counter is pushed on the
stack, when leaving the scope the original value is restored.

This will allow easy querying if the break command is properly nested
within a loop scope.

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
 2014-11-25 14:14:15 -05:00
Ådne Hovda
6b045c3ba8 ccmake: Add CMAKE_USE_SYSTEM_FORM option to use libform instead of cmForm 2014-11-25 11:29:58 -05:00
Brad King
c7b9fad117 Merge topic 'remove-ancient-msvc-workarounds' 
12cb0b86 Help: Update developer manual with some C++ features now permitted.
ba74465f cmGeneratorTarget: Remove MSVC7 workaround
41363c0c VisualStudio: Remove MSVC6 compatibility macro.
4efcfe52 cmSystemTools: Remove MSVC6 compatibility define.
5f4695cd cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro.
7a064337 cmFindCommon: Remove MSVC6 workaround for nested struct private access.
fdb73547 cmTarget: Remove std::min and std::max MSVC6 compatibility code.
 2014-11-25 10:28:57 -05:00
Brad King
4987b37165 Merge topic 'remove-c_str' 
5eb4d759 Remove some unneeded c_str calls.
 2014-11-25 10:18:49 -05:00
Brad King
2fefe9e575 Merge topic 'fortran-linker-flags' 
17b0fe03 Fix incremental linking setting for Fortran + VS
 2014-11-25 10:18:45 -05:00
Brad King
ce64e3607f Merge topic 'cmTarget-null_ptr-everywhere' 
32a191ce cmTarget: Use null_ptr code path on all platforms
 2014-11-25 10:18:35 -05:00
Brad King
6a2c7e1e0d Merge topic 'file-GENERATE-rerun' 
26e98c34 file(GENERATE): Re-run cmake when appropriate.
 2014-11-25 10:18:29 -05:00
Brad King
c8da86a094 Merge topic 'clean-autogen' 
3bd59b60 QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible.
bf00f528 QtAutogen: Don't take a reference to temporary.
 2014-11-25 10:18:23 -05:00
Brad King
a5531950cc Merge topic 'ccmake-hpux' 
7a687292 ccmake: Cleanup and simplify conditional blocks for HP-UX
44f02b42 ccmake: Use standard getmaxyx instead of non-standard getmax[xy]
ee3d06a4 ccmake: Remove incomplete support for cur_colr on old HP-UX
 2014-11-25 10:18:21 -05:00
Brad King
0f19208076 Merge topic 'custom-command-byproducts' 
557aef0b ExternalProject: Add options to specify BYPRODUCTS (#14963)
e15a7075 Add an option for explicit BYPRODUCTS of custom commands (#14963)
 2014-11-25 10:18:16 -05:00
Kitware Robot
c5ac0fce5c CMake Nightly Date Stamp 2014-11-25 00:01:13 -05:00
Kitware Robot
7e8fe68e9c CMake Nightly Date Stamp 2014-11-24 00:01:08 -05:00
Stephen Kelly
5eb4d7590e Remove some unneeded c_str calls. 2014-11-23 11:09:54 +01:00
Kitware Robot
2a0c654858 CMake Nightly Date Stamp 2014-11-23 00:01:08 -05:00
Kitware Robot
2ed0088b2a CMake Nightly Date Stamp 2014-11-22 00:01:07 -05:00
Zack Galbreath
17b0fe0305 Fix incremental linking setting for Fortran + VS 
This commit fixes a bug where it was impossible to specify
/INCREMENTAL to Fortran projects built with Visual Studio.

The problem was due to the fact that .vfproj files expect
the value of this flag to be "linkIncremental{No,Yes},
whereas .vcproj files expect this value to be 0, 1, or 2.

The implementation of this fix adds a new data structure for
Visual Studio linker flags specific to Fortran.  This can
easily be extended in the future if more such discrepencies
between C/C++ and Fortran linking are discovered.
 2014-11-21 13:32:45 -05:00
Kitware Robot
a075777ca1 CMake Nightly Date Stamp 2014-11-21 00:01:11 -05:00
Stephen Kelly
ba74465fbc cmGeneratorTarget: Remove MSVC7 workaround 
Use partial specialization everywhere.
 2014-11-20 23:07:22 +01:00
Stephen Kelly
41363c0c61 VisualStudio: Remove MSVC6 compatibility macro. 2014-11-20 22:25:44 +01:00
Stephen Kelly
4efcfe52f4 cmSystemTools: Remove MSVC6 compatibility define. 2014-11-20 22:24:27 +01:00
Stephen Kelly
5f4695cd06 cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro. 2014-11-20 22:22:45 +01:00
Stephen Kelly
7a0643379b cmFindCommon: Remove MSVC6 workaround for nested struct private access. 2014-11-20 22:22:00 +01:00
Stephen Kelly
fdb7354722 cmTarget: Remove std::min and std::max MSVC6 compatibility code. 
CMake is no longer required to build with MSVC6.
 2014-11-20 22:17:16 +01:00
Brad King
32a191ce4b cmTarget: Use null_ptr code path on all platforms 
This reduces conversions asked of the compiler.  Also drop 'static' from
the declaration of the local null_ptr helper.
 2014-11-20 10:22:07 -05:00
Kitware Robot
b6f6b0a983 CMake Nightly Date Stamp 2014-11-20 00:01:08 -05:00
Kitware Robot
f7b6f3d967 CMake Nightly Date Stamp 2014-11-19 00:01:08 -05:00
Stephen Kelly
26e98c34dc file(GENERATE): Re-run cmake when appropriate. 
Re-run if the input file changes or if the output file is removed.

This only works with the Makefile generators currently.  The limitation
of the Ninja generator is tracked as issue #15256.  The IDE
generators will need larger refactoring as they currently rely on
being able to determine the depends and output files at the start of
generate-time, which is too early for the file(GENERATE) case.
 2014-11-19 00:19:09 +01:00
Stephen Kelly
3bd59b6014 QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible. 2014-11-18 23:20:40 +01:00
Stephen Kelly
bf00f5287b QtAutogen: Don't take a reference to temporary. 
While a const reference to a temporary is standard conformant,
it doesn't seem to be necessary or advantageous here.
 2014-11-18 23:20:40 +01:00
Ådne Hovda
7a68729223 ccmake: Cleanup and simplify conditional blocks for HP-UX 2014-11-18 10:03:35 -05:00
Ådne Hovda
44f02b42fb ccmake: Use standard getmaxyx instead of non-standard getmax[xy] 
Swap out getmax[xy]() calls for single call to getmaxyx(), to support
strict X/Open conformant curses implementations, e.g. HP-UX Xcurses.
 2014-11-18 10:02:33 -05:00
Ådne Hovda
ee3d06a41e ccmake: Remove incomplete support for cur_colr on old HP-UX 
Enable support for the more modern Xcurses.
 2014-11-18 10:02:08 -05:00
Brad King
d526ebc603 Merge topic 'vs-check-phone-store-tools' 
689cd0d4 VS: Do not produce WinMD file for OBJECT libraries (#15228)
b20a32ac VS: Improve error messages when compiler is not detected (#15228)
 2014-11-18 09:12:34 -05:00
Kitware Robot
52fd5775d1 CMake Nightly Date Stamp 2014-11-18 00:01:08 -05:00
Brad King
3609fceee7 Merge topic 'ninja-minor-refactoring' 
67bd514a Ninja: Refactor restat to be a string internally
ef42e57d Ninja: Use a TARGET_FILE variable to hold the link output file
592644c4 Tests/BuildDepends: Drop unneeded help for Ninja
 2014-11-17 11:35:45 -05:00
Brad King
afc557d10e Merge branch 'upstream-kwsys' into update-kwsys 2014-11-17 09:41:57 -05:00
Brad King
444f61e044 Merge topic 'console-pool' 
2d75d7e5 Help: Add notes for topic 'console-pool'
f42d86f0 Ninja: Implement USES_TERMINAL using the console pool if available
f281ae01 Ninja: Remove unused declaration
d5eae556 Ninja: factor out the test for console pool support
4d1fedf4 Give the interactive cache editor the USES_TERMINAL property
fe5d6e8c Add USES_TERMINAL option for custom commands
ad6ee426 Rename doing_verbatim to doing_nothing
 2014-11-17 09:40:56 -05:00
Brad King
e943fa8a19 Merge topic 'vs14-is-2015' 
f5afb90d VS: Rename VS 14 generator to 'Visual Studio 14 2015'
 2014-11-17 09:40:51 -05:00
Brad King
c61efbd684 Merge topic 'fix-vs2015-warnings' 
b138be07 cmVisualStudio10TargetGenerator: fix a narrowing warning
8d379cd7 cmCallVisualStudioMacro: fix a shadowing warning
 2014-11-17 09:40:47 -05:00
Brad King
545d10cc67 Merge topic 'string-SUBSTRING-truncate' 
474bbb9d string: Tolerate SUBSTRING length exceeding end index
 2014-11-17 09:40:44 -05:00
Gilles Khouzam
689cd0d43e VS: Do not produce WinMD file for OBJECT libraries (#15228) 
They are implemented as static libraries for the IDE so treat them the
same.
 2014-11-17 08:57:14 -05:00
Kitware Robot
d42e314900 CMake Nightly Date Stamp 2014-11-17 00:01:07 -05:00
Kitware Robot
f1cd1434a4 CMake Nightly Date Stamp 2014-11-16 00:01:07 -05:00
Kitware Robot
08348aec48 CMake Nightly Date Stamp 2014-11-15 00:01:17 -05:00
Brad King
67bd514adc Ninja: Refactor restat to be a string internally 
This will allow values other than "" and "1" to be generated in
the rules.ninja file.
 2014-11-14 16:16:00 -05:00