summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Include necessary headers in commandsDaniel Pfeifer2016-10-26163-107/+962
|
* Merge branch 'release'Brad King2016-10-250-0/+0
|\
| * Merge branch 'cmake-server-message-quoting' into releaseBrad King2016-10-243-61/+61
| |\
| * \ Merge branch 'intel-compile-features-windows' into releaseBrad King2016-10-242-6/+12
| |\ \
| * \ \ Merge branch 'android-pic' into releaseBrad King2016-10-2415-35/+9
| |\ \ \
| * \ \ \ Merge branch 'backport-ninja-subdir-binary-dir' into releaseBrad King2016-10-248-29/+35
| |\ \ \ \
| * \ \ \ \ Merge branch 'doc-cmake-server-typos' into releaseBrad King2016-10-211-81/+48
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'android-link-exe' into releaseBrad King2016-10-214-0/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'android-armeabi-c++_static' into releaseBrad King2016-10-212-5/+2
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'cm_unordered_set'Brad King2016-10-254-49/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c15dc197 Introduce CM_UNORDERED_SET
| * | | | | | | | | Introduce CM_UNORDERED_SETDaniel Pfeifer2016-10-244-49/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid duplicating switch among std::unordered_set, cmsys::hash_set, and std::set.
* | | | | | | | | | Merge topic 'remove-cmobject'Brad King2016-10-2577-152/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15aa814b Remove cmObject.h and cmTypeMacro.h
| * | | | | | | | | | Remove cmObject.h and cmTypeMacro.hDaniel Pfeifer2016-10-2477-152/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'intel-compile-features-windows'Brad King2016-10-252-6/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 881585f9 Intel: Fix compiler extension flags on Windows
| * | | | | | | | | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extension flags enabled by commit v3.6.0-rc1~120^2~1 (Features: Record standard flags for Intel C/C++ on Windows, 2016-04-18) of the form `-Qstd=gnu++11` are not supported by the Intel C/C++ Compiler for Windows. Fall back to using the non-extension form of the flags. Issue: #16384
* | | | | | | | | Merge topic 'st2-fix-regex'Brad King2016-10-251-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f1429e2 Sublime: Update generated diagnostic matching expression for MSVC
| * | | | | | | | | Sublime: Update generated diagnostic matching expression for MSVCBruno Pedrosa2016-10-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the generated `file_regex` to match MSVC-style messages in addition to the GCC-style messages already matched. Use non-capturing sub-patterns to tolerate the differences in message formats while still capturing the four pieces of information in proper group numbers (file name, line number, column number, message). Closes: #16375
* | | | | | | | | | Merge topic 'android-pic'Brad King2016-10-2515-35/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c272adb Android: Link position-independent executables with proper flags 6205f179 Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically
| * | | | | | | | | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `-fPIE -pie` to the default executable link flags when `CMAKE_POSITION_INDEPENDENT_CODE` is enabled. This is required by Android 16 and above for executables to run on the device. Closes: #16382
| * | | | | | | | | Android: Set CMAKE_POSITION_INDEPENDENT_CODE automaticallyBrad King2016-10-2415-35/+5
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the toolchain file or cache does not set this, enable it automatically based on the Android API version. Versions 16 and above expect position independent code. Use the main `CMAKE_POSITION_INDEPENDENT_CODE` setting in favor of hard-coding `-fpic` or `-fPIC` in the compiler flags for each ABI. This allows CMake to use `-fpie` or `-fPIE` as needed when sources are meant for executables, and `-fpic` or `-fPIC` for other sources.
* | | | | | | | | Merge topic 'ninja-subdir-binary-dir'Brad King2016-10-258-29/+35
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87cc9bfc Merge branch 'backport-ninja-subdir-binary-dir' into ninja-subdir-binary-dir e983bd32 Ninja: Use binary dir for `$subdir/all` targets 42db2ebc Ninja: Use binary dir for `$subdir/all` targets
| * \ \ \ \ \ \ \ \ Merge branch 'backport-ninja-subdir-binary-dir' into ninja-subdir-binary-dirBrad King2016-10-240-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Ninja: Use binary dir for `$subdir/all` targetsAlexis Murzeau2016-10-248-29/+35
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11) use as `$subdir` the relative path from the top of the source tree to the current source directory. This is not correct when using `add_subdirectory(test test_bin)`. Instead we need to use the relative path from the top of the binary tree to the current binary directory as was done for related targets by commit v3.7.0-rc1~268^2 (Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).
| * | | | | | | | Ninja: Use binary dir for `$subdir/all` targetsAlexis Murzeau2016-10-248-29/+35
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11) use as `$subdir` the relative path from the top of the source tree to the current source directory. This is not correct when using `add_subdirectory(test test_bin)`. Instead we need to use the relative path from the top of the binary tree to the current binary directory as was done for related targets by commit v3.7.0-rc1~268^2 (Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).
* | | | | | | | Merge topic 'cmake-server-message-quoting'Brad King2016-10-253-61/+61
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 9b8dc79c cmake-server: Change message wrapper to avoid ambiguity with content
| * | | | | | | cmake-server: Change message wrapper to avoid ambiguity with contentBrad King2016-10-243-61/+61
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change our message wrapper from [== CMake Server ==[ ... ]== CMake Server ==] to [== "CMake Server" ==[ ... ]== "CMake Server" ==] to guarantee that no JSON content can ever contain the ending string (because it would be encoded as `]== \"CMake Server\" ==]`).
* | | | | | | CMake Nightly Date StampKitware Robot2016-10-251-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'doc-cmake-server-typos'Brad King2016-10-241-81/+48
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | 48189697 Help: Fix cmake-server documentation
| * | | | | Help: Fix cmake-server documentationTobias Hunger2016-10-211-81/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some information was not updated to reflect the latest implementation. Reported-by: Sylvain Joubert <joubert.sy@gmail.com>
* | | | | | Merge topic 'cmcommand-no-disable'Brad King2016-10-242-24/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c401f958 Remove cmCommand::Enabled and all related accessors
| * | | | | | Remove cmCommand::Enabled and all related accessorsDaniel Pfeifer2016-10-242-24/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Enabled is never set to false. Remove the member variable and all related getters and setters.
* | | | | | Merge topic 'parallel-boostrap-test'Brad King2016-10-242-4/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3770c56 BootstrapTest: Use --parallel=... argument.
| * | | | | | BootstrapTest: Use --parallel=... argument.Daniel Pfeifer2016-10-212-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Determine the number of processors and provide it to the bootstrap script. Also make sure this test does not run parallel with other tests.
* | | | | | | Merge topic 'remove-cmobject-uses'Brad King2016-10-24144-291/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2214011f Make cmCPackGenerator not inherit from cmObject 7f9a8d53 Make cmCPackGeneratorFactory not inherit from cmObject fb0b087c Make cmCTestGenericHandler not inherit from cmObject 2169b0fa Make cmCPackLog not inherit from cmObject 9855ebf1 Make cmCommand not inherit from cmObject
| * | | | | | | Make cmCPackGenerator not inherit from cmObjectDaniel Pfeifer2016-10-222-5/+6
| | | | | | | |
| * | | | | | | Make cmCPackGeneratorFactory not inherit from cmObjectDaniel Pfeifer2016-10-221-4/+2
| | | | | | | |
| * | | | | | | Make cmCTestGenericHandler not inherit from cmObjectDaniel Pfeifer2016-10-2211-12/+12
| | | | | | | |
| * | | | | | | Make cmCPackLog not inherit from cmObjectDaniel Pfeifer2016-10-221-4/+2
| | | | | | | |
| * | | | | | | Make cmCommand not inherit from cmObjectDaniel Pfeifer2016-10-22129-266/+13
| |/ / / / / /
* | | | | | | Merge topic 'separate-compilation'Brad King2016-10-24121-409/+1225
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 569509f4 Fix newly discovered clang-tidy issues 6c9b3b5c cmCommand: implement functions in cxx file 8483dab8 bootstrap: Sort source files lexicographically 4fb70919 Create all commands from a single function 608afd4f Separate compilation for commands included in cmBootstrapCommands2 64f9c282 Separate compilation for commands included in cmBootstrapCommands1 f69e768d Separate compilation for commands included in cmCommands
| * | | | | | | Fix newly discovered clang-tidy issuesDaniel Pfeifer2016-10-217-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang-tidy reports some issues only from the currently compiled source file and its associated header file. Separating the compilation of commands exposed some clang-tidy issues that were not reported previously. Fix them.
| * | | | | | | cmCommand: implement functions in cxx fileDaniel Pfeifer2016-10-214-42/+57
| | | | | | | |
| * | | | | | | bootstrap: Sort source files lexicographicallyDaniel Pfeifer2016-10-211-90/+90
| | | | | | | |
| * | | | | | | Create all commands from a single functionDaniel Pfeifer2016-10-219-258/+308
| | | | | | | |
| * | | | | | | Separate compilation for commands included in cmBootstrapCommands2Daniel Pfeifer2016-10-2133-50/+237
| | | | | | | |
| * | | | | | | Separate compilation for commands included in cmBootstrapCommands1Daniel Pfeifer2016-10-2120-45/+198
| | | | | | | |
| * | | | | | | Separate compilation for commands included in cmCommandsDaniel Pfeifer2016-10-2162-32/+449
| |/ / / / / /
* | | | | | | Merge topic 'android-link-exe'Brad King2016-10-244-0/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | 295c8efa Android: Add missing link flags for device executables
| * | | | | | Android: Add missing link flags for device executablesBrad King2016-10-214-0/+16
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See `${ndk}/build/core/default-build-commands.mk` for link flags the NDK uses for executables. Add them to our default executable link flags. Suppress `nocopyreloc` on `arm64-v8a` because it does not work with some STL types. Closes: #16380
* | | | | | Merge topic 'cm_unordered_map'Brad King2016-10-247-121/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a74e719 Introduce CM_UNORDERED_MAP