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

21104 Commits

Author SHA1 Message Date
Brad King
62a79dccc5 Merge topic 'cmake-static-FindCacheFile' 
cc770e76 cmake: Make FindCacheFile a static method
 2016-09-15 08:46:37 -04:00
Brad King
0063b6b43c Merge topic 'fix-ccmake-sun-gcc' 
d4d0c942 ccmake: Fix recent compilation regression with GCC on Solaris
 2016-09-15 08:46:34 -04:00
Kitware Robot
100817dc5d CMake Nightly Date Stamp 2016-09-15 00:01:07 -04:00
Brad King
cc770e7670 cmake: Make FindCacheFile a static method 
It does not need access to member data.
 2016-09-14 11:49:24 -04:00
Brad King
d4d0c94226 ccmake: Fix recent compilation regression with GCC on Solaris 
The change in commit 32f756c8 (CursesDialog: include what you use,
2016-09-01) revealed that an ancient workaround for compiling with GCC
on Solaris has not had an effect in a long time and is now incorrect.
Drop it.
 2016-09-14 10:51:27 -04:00
Brad King
ea69e03afa Merge topic 'minor-cleanup' 
6a9ed3d4 cmGeneratorTarget: factor out a space
 2016-09-14 09:02:29 -04:00
Brad King
e9dbb272e0 Merge topic 'cmake-E-help-order' 
e952f1bd cmcmd: Fix sort order in help output
 2016-09-14 08:56:25 -04:00
Brad King
171ea5d3cf Merge topic 'file-curl-userpw' 
abeb42f1 Help: Add notes for topic 'file-curl-userpw'
e5ba1041 file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption
 2016-09-14 08:56:22 -04:00
Brad King
b93623550d Merge topic 'add_androidmk_generator' 
42ce9f1e Add support for creating prebuilt Android.mk files
d5257063 Export: Virtualize file generation step helpers
f81b9475 Export: Factor out file generation steps into helpers
 2016-09-14 08:56:19 -04:00
Brad King
35e3836589 Merge topic 'ctest-subdir-spaces' 
1f8613e9 Fix CTest test file generation for spaces in subdirectory names
385e6a27 cmLocalGenerator: Refactor test subdirectory generation loop
 2016-09-14 08:56:16 -04:00
Brad King
321c179962 Merge topic 'cmake-gui-open-project' 
1ca2d5d1 cmake-gui: Add button to open the generated project
 2016-09-14 08:56:12 -04:00
Kitware Robot
989ca432e4 CMake Nightly Date Stamp 2016-09-14 00:01:04 -04:00
Nico Heßler
1ca2d5d1db cmake-gui: Add button to open the generated project 
Look for VS or Xcode project files at the top of the build tree.
If present, enable an "Open Project" button to open them through
the OS desktop services.
 2016-09-13 16:11:29 -04:00
Stefano Soffia
1f8613e9ba Fix CTest test file generation for spaces in subdirectory names 
Encode the subdirectory names properly for CMake syntax.

Closes: #16299
 2016-09-13 13:58:46 -04:00
Stefano Soffia
385e6a274d cmLocalGenerator: Refactor test subdirectory generation loop 2016-09-13 13:57:59 -04:00
Ruslan Baratov
e5ba1041be file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption 2016-09-13 20:24:12 +03:00
Bill Hoffman
42ce9f1e71 Add support for creating prebuilt Android.mk files 
Add options to the `install()` and `export()` commands to export the
targets we build into Android.mk files that reference them as prebuilt
libraries with associated usage requirements (compile definitions,
include directories, link libraries).  This will allow CMake-built
projects to be imported into projects using the Android NDK build
system.

Closes: #15562
 2016-09-13 12:47:43 -04:00
Brad King
112f758223 Merge topic 'cmake-server-prepare' 
3e58b9af cmake: Factor out method to find the CMakeCache.txt file
c73967cb cmake: Introduce ReportCapabilitiesJson
366e3828 Update .gitignore
 2016-09-13 11:40:50 -04:00
Brad King
994e98bf41 Merge topic 'timestamp-names' 
410add40 Help: Add notes for topic 'timestamp-names'
751f7b52 string(TIMESTAMP ...): add '%a' and '%b' format specifiers
 2016-09-13 11:40:47 -04:00
Brad King
f51f4ee9a3 Merge topic 'fix-ctest-segfault' 
b35311ca CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabled
 2016-09-13 11:40:44 -04:00
Brad King
5b85a3e26c Merge topic 'link-generated-rpaths-first' 
9370b697 Re-order link line to place RPATH entries before libraries
 2016-09-13 11:40:38 -04:00
Brad King
8a56e311ec Merge topic 'file-download-unexpected-arg' 
4dd997da file(DOWNLOAD|UPLOAD): Warn on unexpected arguments
 2016-09-13 11:40:35 -04:00
Ben Boeckel
6a9ed3d4ae cmGeneratorTarget: factor out a space 2016-09-13 11:22:42 -04:00
Tobias Hunger
e952f1bdc7 cmcmd: Fix sort order in help output 
sort "sleep" before "tar", not after
 2016-09-13 11:47:03 +02:00
Kitware Robot
1ba87fd174 CMake Nightly Date Stamp 2016-09-13 00:01:06 -04:00
Tobias Hunger
3e58b9af57 cmake: Factor out method to find the CMakeCache.txt file 2016-09-12 22:00:22 +02:00
Nils Gladitz
b35311ca44 CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabled 
Before the change the list of externals was queried only
before the svn update.

With the change the list is queried both before and after.
This should also be more accurate since the list of externals might
change during the update.
 2016-09-12 19:40:13 +02:00
Ruslan Baratov
751f7b5255 string(TIMESTAMP ...): add '%a' and '%b' format specifiers 
%b: Abbreviated month name (e.g. Oct).
%a: Abbreviated weekday name (e.g. Fri).
 2016-09-12 19:07:38 +03:00
Tobias Hunger
c73967cb4a cmake: Introduce ReportCapabilitiesJson 
Introduce cmake::ReportCapabilitiesJson which returns a the Json object
that is serialized in cmake::ReportCapabilities.

This allows to re-use the information in cmake-server.
 2016-09-12 17:24:06 +02:00
Dan Kegel
9370b697e9 Re-order link line to place RPATH entries before libraries 
Since we support adding arbitrary flags to the link line via
`target_link_libraries` the project/user may add their own RPATH flags
(typically for system library locations).  Re-order the link line to
place our generated RPATH entries before the libraries so that they also
come before flag-specified entries.  Otherwise our in-build-tree RPATH
entries may not be preferred by the dynamic loader and we could collide
with libraries in the system directories.

Closes: #16293
 2016-09-12 10:51:18 -04:00
Brad King
03bae46865 Merge topic 'clang-tidy' 
73128b82 cmDependsFortran: simplify boolean expression
8f324c7c cmSystemTools: simplify boolean expressions
5d3b5bef QCMakeCacheView: simplify boolean expression
ad42eb33 QCMakeCacheView: no else after return
 2016-09-12 09:31:45 -04:00
Brad King
a3aaf0a181 Merge topic 'drop-cygwin-binary' 
db915a37 Utilities/Release: Drop Cygwin binary
 2016-09-12 09:31:39 -04:00
Brad King
f27f6f8f3f Merge topic 'wix-feature-patch' 
c0bccc51 CPackWIX: Enabled patching of WIX <Feature> tags
 2016-09-12 09:31:35 -04:00
Brad King
58e56607c1 Merge topic 'vs-default-v100' 
861f1b3d VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
 2016-09-12 09:31:32 -04:00
Daniel Pfeifer
73128b823c cmDependsFortran: simplify boolean expression 2016-09-12 09:28:21 -04:00
Daniel Pfeifer
8f324c7cef cmSystemTools: simplify boolean expressions 2016-09-12 09:28:21 -04:00
Brad King
db915a3785 Utilities/Release: Drop Cygwin binary 
Cygwin has packaged CMake independently of upstream for a long time.
See its [cygport](https://github.com/cygwinports/cmake).
 2016-09-12 09:22:50 -04:00
Kitware Robot
5088765a2c CMake Nightly Date Stamp 2016-09-12 00:01:04 -04:00
Kitware Robot
4e3166ae1a CMake Nightly Date Stamp 2016-09-11 00:01:06 -04:00
Kitware Robot
d90432c335 CMake Nightly Date Stamp 2016-09-10 00:01:08 -04:00
Ruslan Baratov
4dd997da54 file(DOWNLOAD|UPLOAD): Warn on unexpected arguments 
Emit warning message on unparsed argument instead of silently ignoring it.
Can't stop with the error message because it may break old code.
 2016-09-09 23:19:39 +03:00
Brad King
2572b824d4 Merge topic 'cmGeneratorTarget-cleanup' 
cc6b948e cmGeneratorTarget: factor out common part of AddSources commands
52052ef8 cmGeneratorTarget: use erase-unique instead of reinitialization
3b362230 cmGeneratorTarget: don't clear container in destructor
 2016-09-09 11:18:10 -04:00
Brad King
c40cbccf7d Merge topic 'parse_arguments_argv_n' 
cb299acc cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#
 2016-09-09 11:18:07 -04:00
Brad King
c580227173 Merge topic 'fortran-parser-keywords' 
695f0d0d cmFortranParser: Parse keywords as lexical tokens
1619fb46 cmFortranParser: Simplify grammar by skipping unknown statements
 2016-09-09 11:18:04 -04:00
Brad King
861f1b3da6 VS: Do not default to missing v100 64-bit toolset on VS 2010 Express 
Since commit 059c230d (VS: Explicitly default to v100 toolset in Visual
Studio 2010, 2016-07-21) the VS 2010 generator now correctly defaults to
the v100 toolset instead of no toolset.  However, this broke our logic
for defaulting to the `Windows7.1SDK` toolset for 64-bit builds on VS
2010 Express.  Fix the logic by ignoring the `v100` default in the case.
 2016-09-09 10:17:23 -04:00
Michael Stürmer
c0bccc51df CPackWIX: Enabled patching of WIX <Feature> tags 2016-09-09 13:03:57 +02:00
Kitware Robot
d62a5dfc86 CMake Nightly Date Stamp 2016-09-09 00:01:05 -04:00
Daniel Pfeifer
cc6b948e5e cmGeneratorTarget: factor out common part of AddSources commands 2016-09-08 23:47:16 +02:00
Daniel Pfeifer
52052ef88b cmGeneratorTarget: use erase-unique instead of reinitialization 
Just to make it easier to find places where containers are cleared in
order to be recomputed.
 2016-09-08 23:46:45 +02:00
Daniel Pfeifer
3b3622305b cmGeneratorTarget: don't clear container in destructor 
It will be destroyed anyway.  This also makes it easier to search for
places where containers are atually cleared in order to be recomputed.
 2016-09-08 23:46:18 +02:00