summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-forced-toolchain-dialect' into releaseBrad King2015-11-197-0/+29
|\
| * Project: Guess default standard dialect if compiler was forced (#15852)Brad King2015-11-197-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we always guessed the default language standard dialect based on the compiler version. This was not reliable so that commit switched to computing the default language standard dialect while detecting the compiler id. When a toolchain file uses CMakeForceCompiler to set the compiler id then the detection does not occur. Therefore commit v3.4.0-rc1~54^2 (Project: Don't require computed default dialect if compiler was forced, 2015-09-22) made the lack of detection an error only if the compiler was not forced. However, this means that projects using CMakeForceCompiler no longer even get the guess that we had before so <LANG>_COMPILER does not work. Due to the sophistication of CMake's compiler detection logic projects should be ported away from using CMakeForceCompiler. In the meantime, restore a guess of the default language standard dialect when the compiler is forced.
* | Merge branch 'backport-android-no-versioned-soname' into releaseBrad King2015-11-191-0/+1
|\ \
| * | Android: Restore generation of non-versioned soname (#15851)Brad King2015-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Our check of CMAKE_PLATFORM_NO_VERSIONED_SONAME, originally added by commit v3.1.0-rc1~416^2 (Add basic Android platform module, 2014-06-06), was dropped accidentally by commit v3.4.0-rc1~250^2~21 (cmGeneratorTarget: Move GetLibraryNames from cmTarget, 2015-08-04). Restore the check in the new location of the GetLibraryNames method.
* | | Merge branch 'FindGTest-avoid-CMP0064' into releaseBrad King2015-11-181-3/+3
|\ \ \
| * | | FindGTest: Refactor test type checks to avoid cases triggering CMP0064Brad King2015-11-181-3/+3
| |/ / | | | | | | | | | | | | | | | | | | Update our if() conditions to avoid CMP0064 warnings when `${test_type}` is equal to `TEST`. Reported-by: David T. Chen <dchen@mail.nih.gov>
* | | Merge branch 'fix-ms-manifest-no-linker' into releaseBrad King2015-11-182-1/+5
|\ \ \
| * | | MSVC: Fix linking with /MANIFEST:NO optionBrad King2015-11-182-1/+5
| |/ / | | | | | | | | | | | | | | | Refactoring in commit v3.4.0-rc1~74^2~1 (MSVC: Rewrite manifest file handling with Makefile and Ninja, 2015-09-15) broke handling of this option. Fix it and add a test case.
* | | Merge branch 'fix-compute-default-dialect-lto' into releaseBrad King2015-11-182-0/+2
|\ \ \
| * | | Make C and C++ default dialect detection robust to advanced optimizationsBrad King2015-11-182-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we added an "INFO:..." string to the compiler id detection binary. The value can be optimized out of the compiler id binary unless we force it to be included by making the program behavior depend on it at runtime. Add references to the value as we do for the other info strings already. Gentoo-Issue: https://bugs.gentoo.org/show_bug.cgi?id=565744
* | | Merge branch 'cray-fortran-version' into releaseBrad King2015-11-121-0/+2
|\ \ \ | |/ / |/| |
| * | Cray: Implement Fortran compiler version detection (#15845)Brad King2015-11-121-0/+2
| | | | | | | | | | | | | | | | | | We already recognize the Cray Fortran compiler id. Extract the version number using the same predefined macros we already use for Cray C and C++ compilers.
* | | CMake 3.4.0v3.4.0Brad King2015-11-121-1/+1
| | |
* | | Merge branch 'fix-install-rules' into releaseBrad King2015-11-091-6/+1
|\ \ \
| * | | Install: Move SetHaveInstallRule to a more-obvious placeStephen Kelly2015-11-081-6/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The moved-from location checks for the existence of whether certain generators are needed for any target in a loop, rather than whether the current target has an install rule. This was introduced in commit v3.4.0-rc1~275^2~3 (cmInstallCommand: Move the SetHaveInstallRule invocation., 2015-07-28). Move the SetHaveInstallRule call to a more-obvious place where the cmInstallTargetGenerator is constructed.
* | | CMake 3.4.0-rc3v3.4.0-rc3Brad King2015-11-021-1/+1
| | |
* | | Merge branch 'doc-apple-info-plist-properties' into releaseBrad King2015-10-302-29/+37
|\ \ \
| * | | Help: Document target properties setting Info.plist fields (#15820)Brad King2015-10-302-29/+37
| |/ / | | | | | | | | | | | | Format the documentation of MACOSX_{BUNDLE,FRAMEWORK}_INFO_PLIST and specify for each property what field in the Info.plist file it sets.
* | | Merge branch 'fix-find_program-regression' into releaseBrad King2015-10-305-0/+27
|\ \ \
| * | | find_program: Fix regression in finding an already-known pathBrad King2015-10-305-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit v3.4.0-rc1~124^2~1 (cmFindProgramCommand: Re-implement search using more flexible approach, 2015-09-01) did not preserve the behavior of looking for the given name with no search path at all. Fix this and add a test case covering finding an absolute path with no search directories.
* | | | Merge branch 'intel-fortran-2016' into releaseBrad King2015-10-291-1/+3
|\ \ \ \
| * | | | Intel: Recognize MSVC version for Intel Fortran 2016 (#15809)Brad King2015-10-261-1/+3
| | |/ / | |/| |
* | | | Merge branch 'backport-revert-autorcc-qt-5.1' into releaseBrad King2015-10-291-1/+1
|\ \ \ \
| * | | | Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"Brad King2015-10-271-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0. The `-list` option is not documented and may be removed in future Qt versions. Fixing this correctly will require detecting the availability of `--list` or `-list` based on the `rcc` version found. For now we choose to support the documented option that will be supported in future Qt versions.
* | | | Merge branch 'vs-resw-files' into releaseBrad King2015-10-291-0/+4
|\ \ \ \
| * | | | VS: Add support for `.resw` files (#15811)Andrew Shaitorov2015-10-281-0/+4
| |/ / / | | | | | | | | | | | | | | | | These are used on the WinRT & WinPhone platforms. Build them using the `PRIResource` tool.
* | | | Merge branch 'cpack-deb-fakeroot-removal' into releaseBrad King2015-10-231-1/+1
|\ \ \ \
| * | | | CPackDEB: Use proper compression scheme for control.tar.gzRaffi Enficiaud2015-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit v3.4.0-rc1~79^2~1 (CPackDeb: use of libarchive and removal of fakeroot, 2015-09-11) accidentally set the wrong compression scheme for the `control.tar.gz` file. Set it explicitly to GZip.
* | | | | Merge branch 'fix-test-RUN_SERIAL-failure-regression' into releaseBrad King2015-10-235-5/+31
|\ \ \ \ \
| * | | | | CTest: Fix regression in handling of a RUN_SERIAL test that failsBrad King2015-10-235-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.4.0-rc1~390^2~1 (cmCTestMultiProcessHandler: Refactor RUN_SERIAL implementation, 2015-06-01) forgot to update a code path for cleaning up after a failed RUN_SERIAL test. This causes an infinite loop after a RUN_SERIAL test fails. Fix it and add a test.
* | | | | | Merge branch 'doc-add_executable-typo' into releaseBrad King2015-10-221-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Help: Add missing parenthesis in add_executable docsChristopher Dembia2015-10-221-1/+1
| | |/ / / | |/| | |
* | | | | CMake 3.4.0-rc2v3.4.0-rc2Brad King2015-10-211-1/+1
| | | | |
* | | | | Merge branch 'fix-CMP0054-elseif-warning' into releaseBrad King2015-10-2110-12/+108
|\ \ \ \ \
| * | | | | cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)Stephen Kelly2015-10-2010-12/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.4.0-rc1~494^2~4 (cmMakefile: Add API for elseif to create backtrace., 2015-05-29) removed the use of cmMakefileCall to push/pop execution context in favor of a new way to create backtraces. However, a call to cmMakefile::GetExecutionContext is still invoked to issue a contextual CMP0054 warning through cmConditionEvaluator. As the elseif is not part of the call stack, this resulted in trying to access an empty vector. Avoid the attempt at getting execution context when evaluating elseif by constructing a context and backtrace on behalf of the cmConditionEvaluator in all cases.
* | | | | | Merge branch 'doc-file-GLOB-no-order' into releaseBrad King2015-10-211-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Help: Document that file(GLOB*) order is undefinedRuslan Baratov2015-10-211-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Since this command use 'readdir' under the hood the order of list is undefined: * http://stackoverflow.com/questions/8977441/does-readdir-guarantee-an-order
* | | | | Merge branch 'doc-add_test-requirements' into releaseBrad King2015-10-191-0/+7
|\ \ \ \ \
| * | | | | Help: Document add_test expectations of test command (#15798)Brad King2015-10-191-0/+7
| |/ / / /
* | | | | Merge branch 'ExternalProject-fix-git-version' into releaseBrad King2015-10-151-1/+2
|\ \ \ \ \
| * | | | | ExternalProject: Always use CMake builtin FindGit (#15791)Brad King2015-10-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unset CMAKE_MODULE_PATH before calling find_package(Git) to ensure we do not get a project-provided FindGit module that may not provide the GIT_VERSION_STRING that we need. We do not need to restore the value explicitly because this occurs inside the _ep_add_download_command function call scope.
| * | | | | ExternalProject: Fix Git version report in error message (#15791)Brad King2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.4.0-rc1~77^2~1 (ExternalProject: Use GIT_VERSION_STRING instead of custom method, 2015-09-17) forgot to update the variable name used in an error message.
* | | | | | Merge branch 'doc-INCLUDES-relnote' into releaseBrad King2015-10-131-0/+4
|\ \ \ \ \ \
| * | | | | | Help: Add release note about compile rule placeholder changes (#15787)Brad King2015-10-131-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change made by commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) affects an internal interface. Since it is commonly used by projects anyway, add a release note covering the change in placeholders.
* | | | | | Merge branch 'xcode-adjust-deployment-to-host-version' into releaseBrad King2015-10-121-0/+4
|\ \ \ \ \ \
| * | | | | | Xcode: Adjust deployment target SDK version to host versionGregor Jasny2015-10-121-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the automatically selected SDK is newer than the host OS version and no deployment version has been set then adjust the deployment version to the host OS version. Otherwise the user won't be able to launch the executables on the build host. This is for example a problem on a MacOSX 10.10 host with Xcode 7 which only provides a MacOSX10.11 SDK.
* | | | | | Merge branch 'FindPostgreSQL-v9.5' into releaseBrad King2015-10-121-1/+1
|\ \ \ \ \ \
| * | | | | | FindPostgreSQL: Search for version 9.5Tamar Kranenburg2015-10-121-1/+1
| |/ / / / /
* | | | | | Merge branch 'cpack-wix-typos' into releaseBrad King2015-10-121-2/+2
|\ \ \ \ \ \
| * | | | | | CPackWIX: fix typos in documentationKevin Wojniak2015-10-081-2/+2
| |/ / / / /
generated by cgit v0.12 at 2025-02-15 01:45:44 (GMT)