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

20819 Commits

Author SHA1 Message Date
Brad King
01632c2552 Merge topic 'xmlwriter' 
e9da5192 CPack/PackageMaker: port to cmXMLWriter
 2016-06-09 09:18:21 -04:00
Daniel Pfeifer
e9da5192e5 CPack/PackageMaker: port to cmXMLWriter 2016-06-09 09:16:34 -04:00
Kitware Robot
3969994758 CMake Nightly Date Stamp 2016-06-09 00:01:07 -04:00
Daniel Pfeifer
9f25fc4dbb Prefer std::ostream& over derivatives as parameters 2016-06-08 23:08:40 +02:00
Daniel Pfeifer
f9cc43ea37 cmake: remove unnused member Verbose 2016-06-08 23:08:33 +02:00
Stephen Kelly
6e65808516 cmake: Fix constness of methods 2016-06-08 23:08:29 +02:00
Stephen Kelly
87ffd76d1a cmake: Make internal method file static 2016-06-08 23:08:24 +02:00
Stephen Kelly
fa169fe8a7 Parser: Merge identical conditions 2016-06-08 23:08:14 +02:00
Tobias Hunger
de4ee088e7 cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookup 2016-06-08 16:41:41 -04:00
Tobias Hunger
b0d3e693f1 cmLocalGenerator: Pass configuration to GetTargetFlags 
Move the configuration lookup to call sites.  This will allow
multi-configuration callers to use the method.
 2016-06-08 16:18:31 -04:00
Brad King
8632251b25 Merge topic 'find_path-in-framework' 
188baef0 find_path: Fix location of <dir/header.h> in a framework on OS X
 2016-06-08 12:56:00 -04:00
Brad King
5572f5fffd Merge topic 'clang-format-again' 
ff08a80a Source/CPack: Run clang-format to fix style
3b284432 Tests/FindOpenCL: Run clang-format to fix style
 2016-06-08 12:55:58 -04:00
Brad King
ea59867187 Run ranlib on archives only if the tool is available 
CMakeFindBinUtils sets CMAKE_RANLIB to `:` if it is not available in
order to get a no-op.  This does not work on a Windows host build
environment that runs commands in `cmd` instead of `sh`.  Teach the
Ninja and Makefile generators to simply skip the command if it is `:`.

This this was already done by the Makefile generator since commit
v2.6.0~3161 (BUG: Do not write link script lines that use the ':',
2006-06-18), but only when using a link script.

Reported-by: Michael Jäntsch <Michael.Jaentsch@gmx.de>
 2016-06-08 12:00:44 -04:00
Kitware Robot
1cfc750150 CMake Nightly Date Stamp 2016-06-08 00:01:07 -04:00
Harry Mallon
188baef00c find_path: Fix location of <dir/header.h> in a framework on OS X 
After finding it in `foo.Framework/Headers/dir/header.h`, we should
report the `foo.Framework/Headers` directory, not
`foo.Framework/Headers/dir`, because the former is what actually
contains the path the caller wishes to include.
 2016-06-07 09:04:35 -04:00
Brad King
ff08a80af1 Source/CPack: Run clang-format to fix style 2016-06-07 08:41:16 -04:00
Brad King
633d99dc62 Merge topic 'remove-c_str' 
fa277b29 Remove c_str() calls from stream arguments.
ba5fb165 call static cmOutputConverter::GetFortranFormat without object
 2016-06-07 08:34:04 -04:00
Kitware Robot
14de21d7d2 CMake Nightly Date Stamp 2016-06-07 00:01:07 -04:00
Daniel Pfeifer
fa277b29e4 Remove c_str() calls from stream arguments. 
Mostly automated:

git grep -l '.c_str() <<' | xargs sed -i 's|\.c_str() <<| <<|g'
 2016-06-06 23:53:32 +02:00
Daniel Pfeifer
ba5fb16519 call static cmOutputConverter::GetFortranFormat without object 2016-06-06 23:32:38 +02:00
Brad King
d546456765 Merge topic 'productbuild' 
63e5eb5f Help: Add notes for 'productbuild' topic
2e3c67d1 productbuild: Add new productbuild cpack generator.
50a3d340 PackageMaker: factor out common code for creating pkg files.
 2016-06-06 11:19:20 -04:00
Kitware Robot
fc45ecfc50 CMake Nightly Date Stamp 2016-06-06 00:01:05 -04:00
Kitware Robot
1503a67bf4 CMake Nightly Date Stamp 2016-06-05 00:01:05 -04:00
Kitware Robot
6a22a7cf71 CMake Nightly Date Stamp 2016-06-04 00:01:05 -04:00
Clinton Stimpson
2e3c67d1b6 productbuild: Add new productbuild cpack generator. 
This cpack generator basically replaces the obsolete PackageMaker generator.
 2016-06-03 14:41:57 -06:00
Brad King
0663dbf133 Merge topic 'minor-cleanups' 
f6c21894 Modules: Rename internal platform-specific compiler determination modules
0c7951a9 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
 2016-06-03 10:45:59 -04:00
Brad King
9d16f64048 Merge topic 'fix-TARGET_PROPERTY-LOCATION-crash' 
f500a784 Fix crash on $<TARGET_PROPERTY:...,LOCATION> genex (#16134)
 2016-06-03 10:45:57 -04:00
Brad King
3d6638471a Merge topic 'size-empty' 
c6220de2 Use the empty() method to check for emptyness.
 2016-06-03 10:45:52 -04:00
Brad King
811831a958 Merge topic 'simplify-boolean-expressions' 
7f6b8d33 Simplify boolean expressions
 2016-06-03 10:45:40 -04:00
Kitware Robot
8b289db739 CMake Nightly Date Stamp 2016-06-03 00:01:19 -04:00
Daniel Pfeifer
c6220de276 Use the empty() method to check for emptyness. 
Apply fix-its from clang-tidy's readability-container-size-empty
checker.
 2016-06-02 21:35:50 +02:00
Brad King
7e8cfb9549 Merge branch 'fix-TARGET_PROPERTY-LOCATION-crash' into release 2016-06-02 11:08:09 -04:00
Brad King
f500a784d0 Fix crash on $<TARGET_PROPERTY:...,LOCATION> genex (#16134) 
Policy CMP0026 deprecated the LOCATION property, and we have long
provided a $<TARGET_FILE:...> generator expression.  However, if
a project tries to use $<TARGET_PROPERTY:...,LOCATION> we should
at least not crash.

The compatibility implementation of the LOCATION property uses
cmGlobalGenerator::CreateGenerationObjects to create the structures
needed to evaluate the property before generation starts.  The
implementation assumed that accessing the property could only be done
during configuration (via the typical get_property command use case).
The $<TARGET_PROPERTY:...,LOCATION> genex causes the LOCATION property
to be accessed during generation.  Calling CreateGenerationObjects
during generation blows away all the objects currently being used for
generation and is not safe.  Add a condition to call it only when
configuration is not finished.
 2016-06-02 10:58:38 -04:00
Brad King
0c7951a939 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags 
Make room for possible future non-Apple architecture flags.
 2016-06-02 09:47:32 -04:00
Brad King
f1ff6301ea Merge topic 'minor-cleanups' 
2175e5bf cmGlobalGenerator: Make IsMultiConfig() const
 2016-06-02 09:44:53 -04:00
Brad King
c6bcb6fa1e Merge topic 'bin-dir-option' 
18bfbc97 Add option to control 'bin' directory of CMake's own installation (#16076)
 2016-06-02 09:44:48 -04:00
Daniel Pfeifer
7f6b8d3399 Simplify boolean expressions 
Use clang-tidy's readability-simplify-boolean-expr checker.
After applying the fix-its, revise all changes *very* carefully.
Be aware of false positives and invalid changes.
 2016-06-02 08:24:04 -04:00
Kitware Robot
34d07d7ccc CMake Nightly Date Stamp 2016-06-02 00:01:10 -04:00
Clinton Stimpson
50a3d34005 PackageMaker: factor out common code for creating pkg files. 2016-06-01 21:56:50 -06:00
Tobias Hunger
2175e5bfa5 cmGlobalGenerator: Make IsMultiConfig() const 2016-06-01 11:12:58 -04:00
Nicolas BUNEL
18bfbc972f Add option to control 'bin' directory of CMake's own installation (#16076) 
Add a `CMAKE_BIN_DIR` cache entry to CMake's own build configuration.
Add a `--bindir` option to the `bootstrap` script to set it.
 2016-06-01 11:12:36 -04:00
Brad King
d6754d37d5 Begin post-3.6 development 2016-06-01 10:59:26 -04:00
Brad King
91f6e7904a CMake 3.6.0-rc1 version update 2016-06-01 10:57:43 -04:00
Brad King
4062d6d694 Merge topic 'minor-cleanups' 
bd4fef64 cmSourceFileLocation: Fix typo in comment
814e774e cmSearchPath: Fix typo in comment
 2016-06-01 09:04:48 -04:00
Tobias Hunger
bd4fef6406 cmSourceFileLocation: Fix typo in comment 2016-06-01 08:33:48 -04:00
Tobias Hunger
814e774eff cmSearchPath: Fix typo in comment 2016-06-01 08:33:35 -04:00
Kitware Robot
adc7fcd013 CMake Nightly Date Stamp 2016-06-01 00:01:07 -04:00
Kitware Robot
88ede8e5ea CMake Nightly Date Stamp 2016-05-31 00:01:06 -04:00
Kitware Robot
8afadaa5b2 CMake Nightly Date Stamp 2016-05-30 00:01:05 -04:00
Kitware Robot
e0fbd95f06 CMake Nightly Date Stamp 2016-05-29 00:01:05 -04:00