summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'toolchain-include_directories' into release-3.14Brad King2019-03-257-1/+34
|\ | | | | | | Merge-request: !3140
| * Restore support for include_directories() in toolchain filesBrad King2019-03-257-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any `include_directories()` calls in toolchain files are used during our ABI detection step even though it does not include any system headers. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2), that check is also used to detect implicit include directories. Any `include_directories()` in a toolchain file are detected as implicit and later excluded from explicit specification on compiler command lines, thus breaking the purpose of the calls in the first place. Fix the implicit include directory detection step to avoid using paths from `include_directories()` calls in the toolchain file. Fixes: #19079
* | Merge branch 'doc-cmp0082' into release-3.14Brad King2019-03-211-3/+5
|\ \ | | | | | | | | | Merge-request: !3133
| * | Help: Clarify policy CMP0082 documentationBrad King2019-03-211-3/+5
| |/ | | | | | | | | | | | | The policy documentation added by commit fc8955e889 (add_subdirectory: Run subdirectory install rules in correct order, 2018-10-02, v3.14.0-rc1~565^2~1) left out our usual sentence about the policy providing compatibility.
* | Merge branch 'armcc-compiler-id' into release-3.14Brad King2019-03-201-1/+1
|\ \ | | | | | | | | | Merge-request: !3127
| * | ARMCC: Fix identification of ARM compiler when it defines GNU macrosBrad King2019-03-201-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | According to ARMCC 5.06 documentation: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0472m/chr1359125007083.html the compiler may define `__GNUC__` in addition to `__ARMCC_VERSION`. Re-order our preprocessor checks to consider the ARM-specific macro first so that the ARM compiler is not mistaken for a GNU compiler. Fixes: #19065
* | Merge branch 'eclipse-interface-lib' into release-3.14Brad King2019-03-201-0/+5
|\ \ | | | | | | | | | Merge-request: !3125
| * | Eclipse: Fix extra generator to not crash on interface librariesBrad King2019-03-201-0/+5
| |/ | | | | | | | | | | | | | | | | | | | | Do not process interface libraries in ways that expect build information to be present internally. This filtering was left out of the extra generator accidentally when interface libraries were introduced, but it worked by accident until commit 76ad2ecb50 (Order SYSTEM include directories after non-system directories, 2018-04-13, v3.12.0-rc1~179^2) added a code path that was not tolerated. Fixes: #18363
* | Merge branch 'find_program-windows-share' into release-3.14Brad King2019-03-141-1/+1
|\ \ | | | | | | | | | Merge-request: !3105
| * | find_program: Restore leading double slash on Windows network pathBrad King2019-03-141-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c76c1ea208 (find_program: Consider CWD only for paths with separator, 2018-05-31, v3.13.0-rc1~413^2) we accidentally convert the leading `//` to just `/` on results with Windows network paths. This was caused by `CollapseCombinedPath` being less robust than `CollapseFullPath`. Restore use of the latter but in a way that preserves the requirement of the above commit to support candidates that are themselves absolute. Fixes: #19049 Issue: #19050
* | Merge branch 'FindPython-ensure-correct-architecture-selected' into release-3.14Brad King2019-03-144-8/+29
|\ \ | | | | | | | | | Merge-request: !3103
| * | FindPython*: ensure correct architecture is selected.Marc Chevrier2019-03-144-8/+29
| |/ | | | | | | | | | | | | | | Ensure interpreter and libraries architecture matches CMake build configuration. Update documentation about interpreter constraints. Fixes: #19024
* | Merge branch 'vs2019-wow64' into release-3.14Brad King2019-03-141-5/+10
|\ \ | |/ |/| | | Merge-request: !3102
| * VS: Fix x64 host recognition by x86 cmake processBrad King2019-03-141-5/+10
|/ | | | | | | | | | | | | In commit 57e48f16f2 (VS: Add Visual Studio 16 2019 generator, 2019-01-09, v3.14.0-rc1~150^2) and commit 0fd742a6ff (VS: Teach VS 2019 generator to select host tools matching host arch, 2019-01-28, v3.14.0-rc1~63^2) we intended to select the `x64` target architecture and `x64` host tools by default on x64 host machines. Fix detection of a x64 host when CMake itself is a 32-bit x86 process. The KWSys SystemInformation `Is64Bits` member is not set correctly, which led to this bug. Pending investigation on the KWSys side, simply test ourselves via `IsWow64Process`.
* CMake 3.14.0v3.14.0Brad King2019-03-141-1/+1
|
* Merge branch 'revert-vs-msbuild-arch' into release-3.14Brad King2019-03-121-12/+0
|\ | | | | | | Merge-request: !3090
| * VS: Revert "Use MSBuild matching toolset host architecture"Brad King2019-03-121-12/+0
| | | | | | | | | | | | | | | | | | | | | | Revert commit da402a081b (VS: Use MSBuild matching toolset host architecture, 2019-01-28, v3.14.0-rc1~50^2). Multiple people have reported that the 64-bit `amd64/msbuild` tool fails in cases that the 32-bit `msbuild` works. Drop our change pending further investigation and hopefully a fix to VS. Fixes: #18904, #19037 Issue: #18219
* | Merge branch 'wix-cmake-downgrade-fix' into release-3.14Brad King2019-03-121-0/+2
|\ \ | |/ |/| | | Merge-request: !3087
| * CMake: Fix WiX installer downgrades with versioned binariesNils Gladitz2019-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 5b9da05b7a (Windows: Embed version information into CMake binaries, 2017-10-25, v3.11.0-rc1~411^2) our binaries have version information that prevents a `.msi` downgrade from replacing them by default. Configure the re-install mode: * a: reinstall all files regardless of version * m: rewrite all per-machine registry entries * u: rewrite all per-user registry entries * s: reinstall shortcuts and icons Fixes: #19006
* | CMake 3.14.0-rc4v3.14.0-rc4Brad King2019-03-081-1/+1
| |
* | Merge branch 'cxx-checks-warning-match' into release-3.14Brad King2019-03-071-1/+1
|\ \ | | | | | | | | | Merge-request: !3075
| * | C++ feature checks: Match warnings more strictlyBrad King2019-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Require the word "warning" to appear at the start of a line, after whitespace, or after a `:`. This is the same that CTest launchers use to match warnings. It avoids matching "warning" inside file paths. Fixes: #19019
* | | Merge branch 'install-no-imported-global' into release-3.14Brad King2019-03-075-1/+14
|\ \ \ | | | | | | | | | | | | Merge-request: !3071
| * | | install: Do not crash on imported global targetBrad King2019-03-075-1/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e89ad0f94e (install: Allow installing targets created in another directory, 2018-06-18, v3.13.0-rc1~407^2) the `install(TARGETS)` command may find a global-scoped target outside the calling directory. Ignore an `IMPORTED GLOBAL` target if it is found in this way. Imported targets cannot be installed, and trying to do so violates internal invariants. Fixes: #19022
* | | Merge branch 'vs-explicit-newline' into release-3.14Brad King2019-03-061-0/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !3065
| * | | VS: Encode newlines in XML attributesLuca Cappa2019-03-061-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Encode `\n` as `
` to avoid generating a literal newline inside an XML attribute. This is more readable and also fixes custom commands in `.csproj` files with VS 2019 RC. Fixes: #19001
* | | Merge branch 'docs-xcode-schemes' into release-3.14Brad King2019-03-063-34/+29
|\ \ \ | | | | | | | | | | | | Merge-request: !3066
| * | | Help: Remove note that Xcode scheme generator is experimentalCraig Scott2019-03-061-5/+0
| | | |
| * | | Help: Trivial typo fix for CMAKE_XCODE_GENERATE_SCHEMECraig Scott2019-03-061-1/+1
| | | |
| * | | Help: Sort lists of (CMAKE_)XCODE_SCHEME_... variables and propertiesCraig Scott2019-03-063-28/+28
| |/ /
* | | Merge branch 'docs-install-destinations' into release-3.14Brad King2019-03-051-51/+85
|\ \ \ | | | | | | | | | | | | Merge-request: !3052
| * | | Help: clarify DESTINATION and TYPE usage for install()Craig Scott2019-03-051-51/+85
| |/ /
* | | Merge branch 'ios-docs' into release-3.14Brad King2019-03-052-1/+62
|\ \ \ | | | | | | | | | | | | Merge-request: !3047
| * | | Help: CMAKE_MACOSX_BUNDLE is ON for iOS/tvOS/watchOSRuslan Baratov2019-03-051-0/+3
| | | |
| * | | Help: Example of tweaking iOS/tvOS/watchOS buildRuslan Baratov2019-03-051-0/+48
| | | | | | | | | | | | | | | | | | | | CMAKE_OSX_ARCHITECTURES and CMAKE_OSX_DEPLOYMENT_TARGET variables can be used to tweak iOS/tvOS/watchOS build
| * | | Help: find_package with fat iOS librariesRuslan Baratov2019-03-051-1/+11
| |/ /
* | | Merge branch 'ios-variable' into release-3.14Brad King2019-03-054-0/+11
|\ \ \ | | | | | | | | | | | | Merge-request: !3051
| * | | iOS: Add IOS variableRuslan Baratov2019-03-054-0/+11
| |/ / | | | | | | | | | | | | | | | | | | Since commit 11da882a12 (Apple: Introduce separate system name for iOS, tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) we support setting `CMAKE_SYSTEM_NAME` to `iOS`. Existing iOS toolchain files already set `IOS` as a short-hand variable, so do the same here.
* | | Merge branch 'FindPython-NumPy-fix-include-dir' into release-3.14Brad King2019-03-042-3/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !3053
| * | | FindPython: Fix NumPy component include directoryMarc Chevrier2019-03-042-3/+2
| |/ / | | | | | | | | | | | | | | | | | | Update the component added by commit 513e77550d (FindPython: Introduce NumPy component, 2018-12-12, v3.14.0-rc1~95^2). The `numpy/` sub-directory should not be part of the include directory. It should be part of the `#include` line.
* | | Merge branch 'vs-fortran-rc' into release-3.14Brad King2019-03-013-1/+11
|\ \ \ | |/ / |/| | | | | Merge-request: !3050
| * | VS: Fix Fortran target type selection with RC sourcesBrad King2019-03-013-1/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran `.vfproj` files do support both Fortran and the Windows Resource compiler (`.rc)` files. Prior to CMake 3.9 we did not support that, but commit 2c9f35789d (VS: Decide project type by linker lang as fallback, 2017-03-30, v3.9.0-rc1~340^2) accidentally enabled it. It was then broken by commit d3d2c3cd49 (VS: Fix Fortran target type selection when linking C++ targets, 2019-02-04, v3.14.0-rc1~13^2). Restore support for Fortran+RC in VS projects and add a test case. Fixes: #19002
* | CMake 3.14.0-rc3v3.14.0-rc3Brad King2019-03-011-1/+1
| |
* | Merge branch 'findjni-paths' into release-3.14Brad King2019-03-011-52/+47
|\ \ | | | | | | | | | Merge-request: !3042
| * | FindJNI: Unify path search, fix support for Java 9Christian Pfeiffer2019-03-011-52/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java 9 restructured the standard location of the AWT libraries due to the removal of the JRE/JDK separation. We should check all possible combinations of subdirectories to the Java root directories to ensure that the libraries will be found after an upgrade. Furthermore, a root directory would contain both, include and library paths, so the search should be unified to ease maintenance on the module.
* | | Merge branch 'ExternalProject-fix-log-in-custom-stamp' into release-3.14Brad King2019-03-011-2/+14
|\ \ \ | | | | | | | | | | | | Merge-request: !3045
| * | | ExternalProject: Restore default log dir with custom stamp dirBrad King2019-03-011-2/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b6f6cac378 (ExternalProject: add LOG_DIR option that allows overriding of log location, 2018-10-12, v3.14.0-rc1~515^2~1) the log directory got its own option. The intention was to fall back to the stamp directory by default. However, the implementation actually only falls back to the same default as the stamp directory and does not consider a custom stamp dir. Update the default log dir computation to fall back to whatever is the final selection for the stamp dir. Fixes: #19000
* | | Merge branch 'cuda_device_link_handle_frameworks' into release-3.14Brad King2019-03-011-0/+12
|\ \ \ | | | | | | | | | | | | Merge-request: !3039
| * | | CUDA: Filter out -framework arguments during device linkingRobert Maynard2019-02-281-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The filter in commit e768d96c74 (CUDA: Filter out host link flags during device linking, 2018-10-22, v3.13.0-rc2~4^2~2^2) removes `-framework` but not the framework name that comes after it. Revise the logic to remove both. Fixes: #18911
* | | Merge branch 'vs2019' into release-3.14Brad King2019-02-282-9/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !3044
generated by cgit v0.12 at 2025-09-09 14:44:15 (GMT)