summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'minor-cleanup'Brad King2016-09-141-3/+3
|\ | | | | | | | | 6a9ed3d4 cmGeneratorTarget: factor out a space
| * cmGeneratorTarget: factor out a spaceBen Boeckel2016-09-131-3/+3
| |
* | Merge topic 'cmake-E-help-order'Brad King2016-09-141-1/+1
|\ \ | | | | | | | | | | | | e952f1bd cmcmd: Fix sort order in help output
| * | cmcmd: Fix sort order in help outputTobias Hunger2016-09-131-1/+1
| | | | | | | | | | | | sort "sleep" before "tar", not after
* | | Merge topic 'file-curl-userpw'Brad King2016-09-141-0/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | abeb42f1 Help: Add notes for topic 'file-curl-userpw' e5ba1041 file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption
| * | | file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboptionRuslan Baratov2016-09-131-0/+26
| | | |
* | | | Merge topic 'add_androidmk_generator'Brad King2016-09-1417-114/+947
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add support for creating prebuilt Android.mk filesBill Hoffman2016-09-1313-7/+805
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Export: Virtualize file generation step helpersBill Hoffman2016-09-082-25/+26
| | | | | | | | | | | | | | | | | | | | Allow subclasses to override the actual content generation.
| * | | | Export: Factor out file generation steps into helpersBill Hoffman2016-09-084-87/+121
| | | | | | | | | | | | | | | | | | | | | | | | | Do not actually generate any content in the driving code paths. Use helpers for that.
* | | | | Merge topic 'ctest-subdir-spaces'Brad King2016-09-141-8/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f8613e9 Fix CTest test file generation for spaces in subdirectory names 385e6a27 cmLocalGenerator: Refactor test subdirectory generation loop
| * | | | | Fix CTest test file generation for spaces in subdirectory namesStefano Soffia2016-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode the subdirectory names properly for CMake syntax. Closes: #16299
| * | | | | cmLocalGenerator: Refactor test subdirectory generation loopStefano Soffia2016-09-131-8/+6
| | |/ / / | |/| | |
* | | | | Merge topic 'cmake-gui-open-project'Brad King2016-09-143-0/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1ca2d5d1 cmake-gui: Add button to open the generated project
| * | | | | cmake-gui: Add button to open the generated projectNico Heßler2016-09-133-0/+46
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2016-09-141-1/+1
|/ / / /
* | | | Merge topic 'cmake-server-prepare'Brad King2016-09-132-22/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e58b9af cmake: Factor out method to find the CMakeCache.txt file c73967cb cmake: Introduce ReportCapabilitiesJson 366e3828 Update .gitignore
| * | | | cmake: Factor out method to find the CMakeCache.txt fileTobias Hunger2016-09-122-17/+26
| | | | |
| * | | | cmake: Introduce ReportCapabilitiesJsonTobias Hunger2016-09-122-5/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'timestamp-names'Brad King2016-09-131-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 410add40 Help: Add notes for topic 'timestamp-names' 751f7b52 string(TIMESTAMP ...): add '%a' and '%b' format specifiers
| * | | | string(TIMESTAMP ...): add '%a' and '%b' format specifiersRuslan Baratov2016-09-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | %b: Abbreviated month name (e.g. Oct). %a: Abbreviated weekday name (e.g. Fri).
* | | | | Merge topic 'fix-ctest-segfault'Brad King2016-09-132-9/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b35311ca CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabled
| * | | | | CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabledNils Gladitz2016-09-122-9/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'link-generated-rpaths-first'Brad King2016-09-131-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9370b697 Re-order link line to place RPATH entries before libraries
| * | | | | Re-order link line to place RPATH entries before librariesDan Kegel2016-09-121-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'file-download-unexpected-arg'Brad King2016-09-131-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4dd997da file(DOWNLOAD|UPLOAD): Warn on unexpected arguments
| * | | | | file(DOWNLOAD|UPLOAD): Warn on unexpected argumentsRuslan Baratov2016-09-091-0/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | Emit warning message on unparsed argument instead of silently ignoring it. Can't stop with the error message because it may break old code.
* | | | | CMake Nightly Date StampKitware Robot2016-09-131-1/+1
| |/ / / |/| | |
* | | | Merge topic 'clang-tidy'Brad King2016-09-123-28/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73128b82 cmDependsFortran: simplify boolean expression 8f324c7c cmSystemTools: simplify boolean expressions 5d3b5bef QCMakeCacheView: simplify boolean expression ad42eb33 QCMakeCacheView: no else after return
| * | | | cmDependsFortran: simplify boolean expressionDaniel Pfeifer2016-09-121-6/+1
| | | | |
| * | | | cmSystemTools: simplify boolean expressionsDaniel Pfeifer2016-09-121-15/+5
| | | | |
| * | | | QCMakeCacheView: simplify boolean expressionDaniel Pfeifer2016-09-081-4/+1
| | | | |
| * | | | QCMakeCacheView: no else after returnDaniel Pfeifer2016-09-081-3/+5
| | |/ / | |/| |
* | | | Merge topic 'drop-cygwin-binary'Brad King2016-09-121-69/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | db915a37 Utilities/Release: Drop Cygwin binary
| * | | | Utilities/Release: Drop Cygwin binaryBrad King2016-09-121-69/+0
| | |/ / | |/| | | | | | | | | | | | | | Cygwin has packaged CMake independently of upstream for a long time. See its [cygport](https://github.com/cygwinports/cmake).
* | | | Merge topic 'wix-feature-patch'Brad King2016-09-123-8/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c0bccc51 CPackWIX: Enabled patching of WIX <Feature> tags
| * | | | CPackWIX: Enabled patching of WIX <Feature> tagsMichael Stürmer2016-09-093-8/+15
| | | | |
* | | | | Merge topic 'vs-default-v100'Brad King2016-09-121-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 861f1b3d VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
| * | | | VS: Do not default to missing v100 64-bit toolset on VS 2010 ExpressBrad King2016-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2016-09-121-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-09-111-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-09-101-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'cmGeneratorTarget-cleanup'Brad King2016-09-092-20/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmGeneratorTarget: factor out common part of AddSources commandsDaniel Pfeifer2016-09-082-11/+10
| | | | |
| * | | | cmGeneratorTarget: use erase-unique instead of reinitializationDaniel Pfeifer2016-09-081-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Just to make it easier to find places where containers are cleared in order to be recomputed.
| * | | | cmGeneratorTarget: don't clear container in destructorDaniel Pfeifer2016-09-081-1/+0
| | |_|/ | |/| | | | | | | | | | | | | | It will be destroyed anyway. This also makes it easier to search for places where containers are atually cleared in order to be recomputed.
* | | | Merge topic 'parse_arguments_argv_n'Brad King2016-09-091-4/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cb299acc cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#
| * | | | cmake_parse_arguments: Add option to read arguments from ARGC/ARGV#Bill Hoffman2016-09-081-4/+53
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ARGC`/`ARGV#` variables in function scope hold the original arguments with no ;-list flattening. Add a way for functions to cleanly parse arguments that may contain `;`. This also avoids extra copying of the arguments. Co-Author: Brad King <brad.king@kitware.com>
* | | | Merge topic 'fortran-parser-keywords'Brad King2016-09-096-491/+567
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 695f0d0d cmFortranParser: Parse keywords as lexical tokens 1619fb46 cmFortranParser: Simplify grammar by skipping unknown statements
| * | | cmFortranParser: Parse keywords as lexical tokensBrad King2016-09-086-466/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the lexer to match and return specific Fortran keywords as tokens. Update the parser to use these instead of always using a WORD token and then checking the text. This avoids extra string comparisons and will allow more grammar productions to be unambiguously added later for additional Fortran statements.