summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Find*.cmake: drop the comments before including FPHSARolf Eike Beer2016-11-2848-106/+1
| | | | | No need to explain this over and over again. While at it, do some other minor cleanups to whitespace and comments (i.e. delete them).
* FindLibArchive: do not set LibArchive_FOUND explicitlyRolf Eike Beer2016-11-281-1/+0
| | | | FPHSA already does this.
* FindLibArchive: use CMAKE_CURRENT_LIST_DIR to find FPHSARolf Eike Beer2016-11-281-4/+1
| | | | | The version of CMake required to build CMake is now new enough to have that variable.
* Merge branch 'release'Brad King2016-11-220-0/+0
|\
| * Merge branch 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT' into releaseBrad King2016-11-213-0/+17
| |\
* | \ Merge topic 'eclipse-subprojects'Brad King2016-11-221-0/+8
|\ \ \ | | | | | | | | | | | | | | | | f84a3acd Eclipse: Fix indexer for subprojects
| * | | Eclipse: Fix indexer for subprojectsAdam Weisi2016-11-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `add_subdirectory(source_dir binary_dir)` with `source_dir` not a subdirectory needs to add a `[Subprojects]` entry to the source path in Eclipse. The Eclipse indexer seems to use those entries as reference to index source files. Closes: #15984
* | | | Merge topic 'imported-interface-no-system'Brad King2016-11-225-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 46005251 Allow NO_SYSTEM_FROM_IMPORTED on imported INTERFACE libraries
| * | | | Allow NO_SYSTEM_FROM_IMPORTED on imported INTERFACE librariesBrad King2016-11-215-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported INTERFACE libraries can specify include directories via `INTERFACE_INCLUDE_DIRECTORIES` so the default behavior of treating them as system include directories applies. Allow users to turn this off by setting `NO_SYSTEM_FROM_IMPORTED` on such targets. Closes: #16443
* | | | | Merge topic 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT'Brad King2016-11-223-0/+17
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | df9fea7f Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable
| * | | | Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variableBrad King2016-11-213-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable documentation was simply missing. Suggested-by: Craig Scott <craig.scott@crascit.com>
* | | | | CMake Nightly Date StampKitware Robot2016-11-221-1/+1
| |/ / / |/| | |
* | | | Merge topic 'doc-imported-interface-libname'Brad King2016-11-211-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b3193996 Help: Mention IMPORTED_LIBNAME_* in interface library property whitelist
| * | | | Help: Mention IMPORTED_LIBNAME_* in interface library property whitelistBrad King2016-11-211-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | This property was added by commit 09cda9d5 (Allow imported INTERFACE libraries to specify a link library name, 2016-11-03) and is in the implementation's whitelist. Add it to the documentation too.
* | | | Merge topic 'capture-clang-tidy-errors'Brad King2016-11-218-7/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80ebc55a cmake: Report if the <LANG>_CLANG_TIDY tool exits with non-zero ce1abfa4 cmake: If ldd for LINK_WHAT_YOU_USE fails to run then report why 44de6157 cmake: Comment why we ignore the include-what-you-use return code
| * | | | cmake: Report if the <LANG>_CLANG_TIDY tool exits with non-zeroBrad King2016-11-187-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `<LANG>_CLANG_TIDY` our internal launcher for the tool must capture its return code and stderr and report them on failure. Otherwise incorrect command lines silently fail. Closes: #16435
| * | | | cmake: If ldd for LINK_WHAT_YOU_USE fails to run then report whyBrad King2016-11-181-3/+7
| | | | |
| * | | | cmake: Comment why we ignore the include-what-you-use return codeBrad King2016-11-182-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include-what-you-use tool always returns non-zero to indicate that it did not actually produce an object file as Clang would from the same command line. Add a comment explaining that this is why we ignore its return code. Also update our `pseudo_iwyu` test suite tool to always exit with an error too.
* | | | | Merge topic 'update-kwsys'Brad King2016-11-211-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4775a99f Merge branch 'upstream-KWSys' into update-kwsys 0a56e6fe KWSys 2016-11-18 (2a3f6f6b)
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-181-0/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-11-18 (2a3f6f6b)
| | * | | | | KWSys 2016-11-18 (2a3f6f6b)KWSys Upstream2016-11-181-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 2a3f6f6b9098d10afb05e894faf262efa22f38b8 (master). Upstream Shortlog ----------------- Dāvis Mosāns (2): a7e82be0 ConsoleBuf: Expose Manager ConsoleBuf to be accessible 2a3f6f6b ConsoleBuf: Add Manager convenience method for UTF-8 pipes
* | | | | | | CMake Nightly Date StampKitware Robot2016-11-211-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-11-201-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-11-191-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2016-11-180-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'vs-15-preview-5' into releaseBrad King2016-11-182-2/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'release'Brad King2016-11-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'backport-android-info-variables' into releaseBrad King2016-11-1811-6/+87
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'armcc-response-file-flag' into releaseBrad King2016-11-151-0/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'backport-android-info-variables'Brad King2016-11-180-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea8eba0b Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE 0d3eb139 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable 236d6244 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
| * | | | | | | | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-188-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | | | | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-186-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | | | | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-186-4/+26
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | | | | | Merge topic 'backport-android-info-variables'Brad King2016-11-181-15/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78db7090 Help: Drop release notes for backported Android variables
| * | | | | | | | Help: Drop release notes for backported Android variablesBrad King2016-11-181-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These do not need to be called out in the 3.7 release notes because they are part of the new Android support feature already covered.
* | | | | | | | | Merge topic 'backport-android-info-variables'Brad King2016-11-180-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | e3cd5599 Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE 5c2100e5 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable 790c0a89 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
| * | | | | | | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-189-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | | | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-187-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | | | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-187-4/+32
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | | | | Merge topic 'auto_project_regeneration'Brad King2016-11-184-11/+65
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 427b6da9 VS: Teach `cmake --build` to reconfigure if needed before building
| * | | | | | | VS: Teach `cmake --build` to reconfigure if needed before buildingYves Frederix2016-11-174-11/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio's build system does not cleanly handle itself being re-generated during the build. Teach `cmake --build` to check whether the build system needs to be re-generated before launching the native build tool.
* | | | | | | | Merge topic 'tolerate-removed-cache'Brad King2016-11-184-0/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25b6e7b7 Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/
| * | | | | | | | Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/Brad King2016-11-174-0/+47
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users or scripts commonly remove or replace `CMakeCache.txt` without also removing `CMakeFiles/`. In this case the information saved in the cache from platform information initialization is missing, so we need to re-initialize it. In such a case, remove the platform information directory so that re-initialization will occur and restore needed information to the cache. Closes: #14820
* | | | | | | | Merge topic 'ExternalProject-cmd-poisoning'Brad King2016-11-181-68/+65
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02445138 ExternalProject: Do not trip over pre-existing 'cmd' variable
| * | | | | | | | ExternalProject: Do not trip over pre-existing 'cmd' variableKarsten Sperling2016-11-171-68/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers of `_ep_get_build_command` do not initialize the output variable they pass and expect the function to unconditionally set it. Revise the function to not check its own output variable. Otherwise if a `cmd` variable happens to be set when `ExternalProject_Add` is called then it will be erroneously used as the default `BUILD`, `TEST`, and `INSTALL` command.
* | | | | | | | | Merge topic 'update-prebuilt-openssl'Brad King2016-11-181-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dafeacb Utilities/Release: Update to openssl-1.0.2j
| * | | | | | | | | Utilities/Release: Update to openssl-1.0.2jBrad King2016-11-171-3/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | | | | Merge topic 'xcode-add-override-keyword'Brad King2016-11-181-26/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0e223cd Xcode: Add override keyword to suppress warnings
| * | | | | | | | | Xcode: Add override keyword to suppress warningsGregor Jasny2016-11-171-26/+28
| |/ / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2016-11-181-1/+1
|/ / / / / / / /