summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* find_*: Disable the PACKAGE_ROOT search path group for CMake 3.9Brad King2017-08-0814-54/+44
| | | | | | | | | | | | | | | | Disable the feature added by commit v3.9.0-rc1~71^2~2 (find_*: Add a new PackageRoot search path group, 2017-05-03) and remove documentation added by commit v3.9.0-rc1~71^2 (find_*: Add docs for PackageRoot search path group, 2017-05-03). Unfortunately the name `<pkg>_ROOT` may already be set by projects for their own incompatible purposes. Disable the behavior change for now to fix the regression for CMake 3.9. We can restore it later with a policy. In order to keep the implementation and tests working, add an undocumented variable we can use in the tests to enable the behavior before the policy is introduced. Fixes: #17144
* find_package: Split PACKAGE_ROOT tests to work with smaller regexChuck Atkins2017-08-027-846/+872
|
* find_package: Fix PACKAGE_ROOT test to check find_pacakge(CONFIG) mode.Chuck Atkins2017-07-287-99/+531
|
* find_package: Add missing PACKAGE_ROOT_PATH search path implementation.Chuck Atkins2017-07-282-0/+21
|
* CMake 3.9.0v3.9.0Brad King2017-07-181-1/+1
|
* Merge branch 'objlib-own-target-objs' into release-3.9Brad King2017-07-176-0/+25
|\
| * Diagnose object library self-referenceBrad King2017-07-146-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code add_library(A OBJECT a.c) target_sources(A PRIVATE $<TARGET_OBJECTS:A>) used to crash CMake via infinite recursion while evaluating the generator expression. Then the change in commit v3.9.0-rc1~266^2~1 (cmGeneratorTarget: Replace source classifier implementation, 2017-04-07) avoided the infinite recursion because GetKindedSources now creates a map entry and initializes it once. If it is called again on the same target during that initialization, the partially computed results are returned. This is still wrong but does not crash. Detect and diagnose this case instead. Co-Author: Ben Boeckel <ben.boeckel@kitware.com> Fixes: #16578
* | Merge branch 'doc-vs2015-update-relnote' into release-3.9Brad King2017-07-141-0/+5
|\ \
| * | Help: Add a 3.9 release note about the VS GenerateDebugInformation updateBrad King2017-07-141-0/+5
| |/ | | | | | | | | | | Add a release note corresponding to the environmental regression fixed by commit v3.9.0-rc6~15^2~1 (VS: Fix GenerateDebugInformation values for v140 and v141 toolsets, 2017-06-27).
* | Merge branch 'xcode9support' into release-3.9Brad King2017-07-142-0/+13
|\ \
| * | Xcode: Add "outputPaths" to custom command script build phaseHarry Mallon2017-07-142-0/+13
| |/ | | | | | | | | | | | | This is needed for Xcode 9's "New Build System", whose release notes mention "that output must be declared as an explicit output by the script which generates it" in reference to outputs of custom script build phases.
* | Merge branch 'backport-fix-lang-std-option-list' into release-3.9Brad King2017-07-141-2/+10
|\ \
| * | Features: Fix support for a list of language standard optionsBrad King2017-07-141-2/+10
| |/ | | | | | | | | | | The change in commit v3.9.0-rc1~174^2~2 (CompileFeatures: Let STD compile options be a list, 2016-10-05) did not change all the places we add the language standard options. Expand the list in the other places.
* | Merge branch 'TestDriver-fix-Wconversion' into release-3.9Brad King2017-07-141-2/+2
|\ \
| * | TestDriver: Fix -Wconversion warningBrad King2017-07-141-2/+2
| |/ | | | | | | | | | | | | Since commit v3.8.0-rc1~51^2~1 (TestDriver: calc NumTests at compile time, 2017-01-24) we convert an expression that uses `sizeof()` to an `int` as a compile-time constant. Some GCC versions warn about this with `-Wconversion`. Add a cast to avoid the warning.
* | Merge branch 'ninja_cuda_export_compile_commands_support' into release-3.9Brad King2017-07-132-7/+24
|\ \
| * | CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and NinjaRobert Maynard2017-07-132-7/+24
| |/ | | | | | | Fixes: #17061
* | Merge branch 'android-system-include-last' into release-3.9Brad King2017-07-137-13/+45
|\ \ | |/ |/|
| * Android: Always add standard include directories lastBrad King2017-07-137-13/+45
|/ | | | | | | | | | | | | | | | | | | | | | | | | | The logic added in commit v3.6.0-rc1~30^2 (Add a variable to specify language-wide system include directories, 2016-05-24) to use `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` incorrectly filters them by `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`. Rather than recognizing this, commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) worked around the problem by incorrectly removing `/usr/include` from `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` so it worked in `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`. By not filtering out `/usr/include` from user-specified include directories, we allow the code include_directories(${CMAKE_SYSROOT}/usr/include) to place the include directory too early on the command line. Fix support for standard include directories to not be filtered by implicit include directories, and do not remove `/usr/include` from the list of implicit include directories for Android builds. Add a test case to verify that an explicit `/usr/include` is ignored in favor of the standard directory at the end. Fixes: #17059
* CMake 3.9.0-rc6v3.9.0-rc6Brad King2017-07-121-1/+1
|
* Merge branch 'android-fix-c++_shared' into release-3.9Brad King2017-07-121-0/+1
|\
| * Android: Link to android_support with c++_sharedBrad King2017-07-121-0/+1
| | | | | | | | | | The NDK has done this in `build/core/definitions.mk` since r13 (r12 and below do so only for c++_static).
* | Merge branch 'vs-2017-sln-guid' into release-3.9Brad King2017-07-1113-12/+37
|\ \
| * | VS: Add SolutionGuid to generated .sln filesBrad King2017-07-1113-12/+37
| |/ | | | | | | | | | | Visual Studio 2017 Update 3 adds a SolutionGuid to its `.sln` files. Fixes: #17041
* | Merge branch 'find_package-root-prefix-path-suffixes' into release-3.9Brad King2017-07-1111-18/+75
|\ \
| * | find_*: Honor PATH_SUFFIXES in PackageName_ROOT pathsBrad King2017-07-119-0/+74
| | | | | | | | | | | | | | | | | | | | | This was accidentally forgotten in commit v3.9.0-rc1~71^2~2 (find_*: Add a new PackageRoot search path group, 2017-05-03). Fixes: #17052
| * | cmFindCommon: Drop unused FilterPaths methodBrad King2017-07-112-17/+0
| | | | | | | | | | | | | | | | | | The method has not been used since commit v3.2.0-rc1~400^2~1 (Encapsulate search path manipulation functions into a seperate class, 2014-10-15).
| * | cmFindCommon: Fix typo in PackageName_ROOT path labelBrad King2017-07-111-1/+1
| |/
* | Merge branch 'bindexplib-revert-consts' into release-3.9Brad King2017-07-103-22/+12
|\ \
| * | bindexplib: Revert support for constants symbolsBrad King2017-07-103-22/+12
| |/ | | | | | | | | | | | | | | | | | | Revert the main logic change of commit v3.9.0-rc1~192^2 (bindexplib: fix constants symbols export, 2017-04-26) and its test case. Unfortunately some constants may be provided by multiple object files with different `@...` suffixes, leading to ambiguous references. Revert support pending further investigation. Fixes: #17045
* | Merge branch 'vs-2017-choose-via-environment' into release-3.9Brad King2017-07-102-0/+40
|\ \
| * | VS: Choose VS 2017 instance via environment variableBrad King2017-07-102-0/+40
| |/ | | | | | | | | | | | | | | | | In the `Visual Studio 15 2017` generator, if the `VS150COMNTOOLS` environment variable points at a specific VS 2017 instance reported by the Visual Studio Installer tool, use that as the preferred instance. Inspired-by: Iyyappa Murugandi <iyyappam@microsoft.com> Fixes: #16846
* | Merge branch 'autogen_skip_included' into release-3.9Brad King2017-07-101-28/+33
|\ \
| * | Autogen: Skip included files on demandSebastian Holtermann2017-07-101-28/+33
| | |
* | | Merge branch 'autogen-no-generated-files' into release-3.9Brad King2017-07-073-0/+10
|\ \ \
| * | | Autogen: Skip generated files for compatibility with CMake 3.8Brad King2017-07-073-0/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc1~464^2~8 (Autogen: Add AUTOMOC/UIC support for generated source files, 2017-03-02) changes behavior of existing projects that may not expect `AUTOGEN` on generated files and do not yet set `SKIP_AUTOGEN` on them. Disable the behavior change for now to fix the regression for CMake 3.9. We can restore it later with a policy. In order to keep the implementation and tests working, add an undocumented property we can use in the tests to enable the behavior before the policy is introduced. Fixes: #17031 Issue: #16186
* | | Merge branch 'find_package-restore-considered-configs' into release-3.9Brad King2017-07-0712-2/+47
|\ \ \ | |_|/ |/| |
| * | find_package: Restore longer message when config files were consideredBrad King2017-07-0712-2/+47
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~58^2 (find_package: shorten output for missing package in config mode, 2017-05-09) we print only the one line - Could NOT find Foo (missing: Foo_DIR) when package Foo cannot be found in CONFIG mode and it is not REQUIRED. However, in the case that package configuration files were found but not used, this one line message leaves out important information. This can happen when a package configuration file sets `Foo_FOUND` to `FALSE` or when its package version file does not match the requested version. Restore the longer message in these cases. Otherwise a seemingly valid explicit `Foo_DIR` setting appears to be silently ignored even if it was considered. Fixes: #17029
* | Merge branch 'FindDoxygen-create-output-dir' into release-3.9Brad King2017-07-061-3/+11
|\ \
| * | FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't existRobert Dailey2017-07-061-3/+11
|/ / | | | | | | | | If the doxygen output directory does not exist, create it prior to running the doxygen commands.
* | Merge branch 'autogen_p' into release-3.9Brad King2017-07-051-1/+0
|\ \
| * | Autogen: Continue search for FOO_p.h when FOO.h was foundSebastian Holtermann2017-07-021-1/+0
| | |
* | | Merge branch 'autogen-header-skip' into release-3.9Brad King2017-07-051-1/+1
|\ \ \
| * | | Autogen: Check .moc header name against SKIP listSebastian Holtermann2017-06-301-1/+1
| | |/ | |/| | | | | | | | | | | | | When encountering an #include "FOO.moc" statement where FOO.hpp was chosen over FOO.cpp as the moc source, the FOO.hpp name was not checked against the moc SKIP list.
* | | Merge branch 'vs-link-guard-cf' into release-3.9Brad King2017-06-302-6/+0
|\ \ \ | |_|/ |/| |
| * | VS: Fix support for '/guard:cf' linker flagOlender, Sebastian D2017-06-302-6/+0
| | | | | | | | | | | | | | | | | | | | | Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets contains an entry for `LinkControlFlowGuard`, it does not work when used in a `.vcxproj` file. Drop our link flag table entries for these toolsets so that the flag will be passed via `AdditionalOptions`.
* | | Merge branch 'FindDoxygen-project-in-subdir' into release-3.9Brad King2017-06-301-5/+5
|\ \ \
| * | | FindDoxygen: Use a stable reference to the location of global resourcesRobert Dailey2017-06-291-5/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindDoxygen generates some files based on the version of Doxygen whose content will not vary across a project and are therefore a global resource that can be shared by all calls to `find_package(Doxygen)` and to `doxygen_add_docs`. We currently use `${PROJECT_BINARY_DIR}` to reference their location, but this is not stable because `project()` calls in a subdirectory can change it. Use `${CMAKE_BINARY_DIR}` instead. Reviewed-by: Craig Scott <craig.scott@crascit.com> Fixes: #17022
* | | Merge branch 'xcode-cross-sdk-object-libraries' into release-3.9Brad King2017-06-302-5/+5
|\ \ \ | |/ / |/| |
| * | Xcode: Use correct Object Library paths for cross-SDK buildsGregor Jasny2017-06-292-5/+5
| |/ | | | | | | | | | | | | | | When calculating Object Library paths take a look at the `XCODE_EMIT_EFFECTIVE_PLATFORM_NAME` property to enable builds with different SDKs. Otherwise a hard-coded architecture could be chosen. Fixes: #16040
generated by cgit v0.12 at 2024-10-19 13:31:35 (GMT)