summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Clarify purpose of method that pops a scope snapshotBrad King2015-11-252-8/+11
| | | | | | | The `PopPolicyBarrier` method is actually responsible for closing any scope opened by creating a snapshot. Rename it to `PopSnapshot` and add a comment explaining the purpose of the poilcy-scope-specific part of the method.
* Merge branch 'test-cmake_policy-unmatched' into ↵Brad King2015-11-2418-0/+36
|\ | | | | | | fix-find_package-version-file-error-stack
| * Tests: Add case for package version file unmatched policy scopeBrad King2015-11-2411-0/+22
| |
| * Tests: Add case for unmatched cmake_policy({PUSH,POP})Brad King2015-11-247-0/+14
| |
* | cmState: Skip variable scope snapshots to avoid call stack duplicatesBrad King2015-11-241-2/+4
| | | | | | | | | | | | | | | | | | Since commit v3.4.0-rc1~179^2~1 (cmState: Add a VariableScope snapshot type, 2015-08-23) the snapshot stack may have a VariableScopeType entry. Skip over these when constructing the call stack, just as we do for policy scopes. Otherwise we report the command causing the variable scope to be entered twice (e.g. find_package while loading a package version file).
* | 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
| |/ / / / /
* | | | | | Merge branch 'emacs-mode-fix-accidental-indentation' into releaseBrad King2015-10-121-4/+4
|\ \ \ \ \ \
| * | | | | | cmake-mode.el: treat keywords as symbolsKevin Burge2015-10-081-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols such as "CHECK_FUNCTION_EXISTS" should not trigger an open block (due to containing the "word" FUNCTION). Fix this regression caused by commit v3.4.0-rc1~292^2~3 (cmake-mode.el: Use `rx' for regexps, 2015-07-23).
* | | | | | Merge branch 'doc-clarify-shared-lib' into releaseBrad King2015-10-122-1/+12
|\ \ \ \ \ \
| * | | | | | Help: Document that SHARED libraries must export a symbol (#15775)James Johnston2015-10-082-1/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake assumes that a SHARED library compiled on Windows will export a LIB file. This is not actually the case on Visual C++ if the library does not export any symbols, and causes incremental builds to break if the user specifies SHARED anyway. (Users should use MODULE libraries instead.)
* | | | | | Merge branch 'revert-compiler-features-solaris' into releaseBrad King2015-10-123-22/+15
|\ \ \ \ \ \
| * | | | | | Revert topic 'compiler-features-solaris'Brad King2015-10-083-22/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.4.0-rc1~10^2~2 (Features: Disable support for Oracle SolarisStudio on non-Linux, 2015-09-29) and two follow-up commits. The support of compile features and language standards on Orcale SolarisStudio needs more investigation so for CMake 3.4 we should just act as 3.3 did.
* | | | | | | Merge branch 'ctest-submit-content-type' into releaseBrad King2015-10-122-0/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
generated by cgit v0.12 at 2025-01-10 04:55:45 (GMT)