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

32423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
ab7d649fae Merge topic 'FindLibArchive-3.2' 
38d18bab FindLibArchive: Support libarchive 3.2 version string format
 2016-06-06 09:20:03 -04:00
Brad King
cd1f0a824e Merge branch 'update-expat' into release 2016-06-06 09:10:48 -04:00
Brad King
182f645801 Merge branch 'upstream-expat' into update-expat 
* upstream-expat:
  expat 2016-06-05 (2b9cb7f5)
 2016-06-06 09:08:33 -04:00
Expat Upstream
eb83112347 expat 2016-06-05 (2b9cb7f5) 
Code extracted from:

    http://git.code.sf.net/p/expat/code_git

at commit 2b9cb7f5b59397d2d04117a419cd3d9d50f4a1ed (master).
 2016-06-06 09:08:21 -04:00
Brad King
cd1327bb9c Merge branch 'SunOS-PathScale' into release 2016-06-06 09:01:00 -04:00
Michał Górny
fcfe121fd8 Platform: add flag definitions for PathScale compiler on SunOS (#16135) 2016-06-06 08:58: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
236b7cbe6e Merge branch 'FindLibArchive-3.2' into release 2016-06-03 13:27:34 -04:00
Orion Poplawski
38d18bab54 FindLibArchive: Support libarchive 3.2 version string format 2016-06-03 13:18:03 -04:00
Alex Turbov
c3a281fd32 FindBoost: Search in official Windows prebuilt binary library directory 
Avoid the need to specify `BOOST_LIBRARYDIR` along with `BOOST_ROOT`
when using prebuilt binaries such as these:

  https://sourceforge.net/projects/boost/files/boost-binaries/
 2016-06-03 11:15:02 -04:00
Alex Turbov
3720d5f4a3 FindBoost: Test CMAKE_CXX_COMPILER_{ID,VERSION} instead of MSVC* 2016-06-03 11:11:38 -04:00
Brad King
cf12e4abcd Merge branch 'release' 2016-06-03 10:50:25 -04: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
2f1d82bd7b Merge topic 'cpack-nsis-remove-duplicate-include' 
e847b6c8 CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)
 2016-06-03 10:45:54 -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
e3f7637659 Merge topic 'FindOpenCL-imported-target' 
b66d4739 FindOpenCL: Add an imported target
 2016-06-03 10:45:48 -04:00
Brad King
4b7834467c Merge topic 'compiler-id-with-bracket-in-path' 
a7d1c4ec CMakeDetermineCompilerId: Fix compiler id with square brackets in the path
 2016-06-03 10:45:46 -04:00
Brad King
6f1f7965af Merge topic 'fix-ti-link-order' 
89317915 Compiler/TI: Pass libraries as last part to linker
 2016-06-03 10:45:43 -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
9703b32c1c Merge branch 'FindHDF5-fix-already-found' into release 2016-06-02 14:56:09 -04:00
Brad King
9ca8c7a99f Merge topic 'FindHDF5-fix-already-found' 
f11243d1 FindHDF5: Add backwards compatability for already-found searches
 2016-06-02 14:55:53 -04:00
Chuck Atkins
f11243d13e FindHDF5: Add backwards compatability for already-found searches 2016-06-02 14:46:32 -04:00
Brad King
a7d1c4ec3f CMakeDetermineCompilerId: Fix compiler id with square brackets in the path 
We use file(GLOB) to load the list of files produced by compiling the
compiler identification source.  Encode square brackets in the path to
the directory so that they are not treated as special characters in the
globbing expression.  Otherwise we fail to find any files when the path
contains square brackets and the compiler id is unknown.

Reported-by: Esch Nigma <eschnigma@openmailbox.org>
 2016-06-02 14:32:07 -04:00
Brad King
e847b6c864 CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132) 
In commit v2.6.0~3438 (ENH: Better support for adding and removing path,
2006-04-27) an include of "WinMessages.NSH" was added without removing
the original include.  Remove it now.
 2016-06-02 11:49:44 -04: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
f6c2189495 Modules: Rename internal platform-specific compiler determination modules 
Rename Modules/Platform/<os>-<lang>.cmake files to
Modules/Platform/<os>-Determine-<lang>.cmake to clarify their role.
For compatibility with user-provided modules, load the old names
if they exist.
 2016-06-02 09:51:43 -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
Brad King
aa483a4053 Merge branch 'fix-ti-link-order' into release 2016-06-02 09:40:11 -04:00
Alexander Stein
89317915d9 Compiler/TI: Pass libraries as last part to linker 
If e.g. libc.a is passed before any objects the linker raises the follwing
warning: cannot resolve archive libc.a to a compatible library, as no
input files have been encountered
In the end the library is skipped and missing symbols occur.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
 2016-06-02 09:39:25 -04:00
Matthäus G. Chajdas
b66d4739b5 FindOpenCL: Add an imported target 2016-06-02 08:46:43 -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
b2ef225ab9 Merge branch 'release' 2016-06-01 10:58:02 -04:00
Brad King
91f6e7904a CMake 3.6.0-rc1 version update 2016-06-01 10:57:43 -04:00
Brad King
4c2993df63 Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2016-06-01 10:55:45 -04:00
Brad King
9d81f1b3aa Merge topic 'doc-3.6-relnotes' 
98eafa9b Help: Organize and revise 3.6 release notes
c5df7483 Help: Consolidate 3.6 release notes
 2016-06-01 10:53:53 -04:00
Brad King
98eafa9b5f Help: Organize and revise 3.6 release notes 
Add section headers similar to the 3.5 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2016-06-01 10:30:34 -04:00