summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Optionally scan only source and build trees for dependenciesAttila Krasznahorkay2016-03-223-0/+72
| | | | Add a `CMAKE_DEPENDS_IN_PROJECT_ONLY` variable to activate the behavior.
* Merge topic 'test-rename-VSSolution'Brad King2016-03-2218-1/+1
|\ | | | | | | | | 5c1f4da8 Tests: Rename RunCMake.{SolutionGlobalSections => VSSolution}
| * Tests: Rename RunCMake.{SolutionGlobalSections => VSSolution}Brad King2016-03-1818-1/+1
| | | | | | | | The test will be suitable for covering other `.sln` content too.
* | Merge topic 'ghs-try_compile'Brad King2016-03-223-2/+12
|\ \ | | | | | | | | | | | | bf3e76d2 GHS: Fix try_compile (#15975)
| * | GHS: Fix try_compile (#15975)Geoff Viola2016-03-213-2/+12
| | |
* | | Merge topic 'ninja-directory-targets'Brad King2016-03-228-0/+117
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9ead71df Help: Add notes for topic 'ninja-directory-targets' e9bf8ec8 Ninja: Add test for `$subdir/all` targets ca575fe9 Ninja: Add `$subdir/all` targets
| * | | Help: Add notes for topic 'ninja-directory-targets'Brad King2016-03-221-0/+7
| | | |
| * | | Ninja: Add test for `$subdir/all` targetsBrad King2016-03-224-0/+21
| | | |
| * | | Ninja: Add `$subdir/all` targetsCharles Huet2016-03-183-0/+89
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the Makefile generator one can use `cd $subdir; make all` to build all targets associated with a given subdirectory. This is not possible to do with the Ninja generator since there is only one `build.ninja` file at the top of the build tree. However, we can approximate it by allowing one to run `ninja $subdir/all` at the top of the tree to build the targets in the corresponding subdirectory. Port logic from cmGlobalUnixMakefileGenerator3::WriteDirectoryRule2 to cmGlobalNinjaGenerator in order to produce equivalent directory-level targets.
* | | Merge topic 'TestBigEndian-log-output'Brad King2016-03-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 8e2aa6ca TestBigEndian: Log success to CMakeOutput.log, not CMakeError.log
| * | | TestBigEndian: Log success to CMakeOutput.log, not CMakeError.logPaweł Stankowski2016-03-211-1/+1
| | | |
* | | | Merge topic 'fix-repeat-pkg-config'Brad King2016-03-222-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6f4f9054 FindPkgConfig: set correctly named variables in cache (#15903)
| * | | | FindPkgConfig: set correctly named variables in cache (#15903)Ben Boeckel2016-03-212-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.5.0-rc1~27^2 (FindPkgConfig: set standard variables in the cache, 2016-01-20) added the wrong variable name to the cache. The test was only testing that the cache variable existed, not that it also had the correct value. Update the test to ensure that the cache value matches the local variable value. Reported-by: Bernd Lörwald
* | | | | Merge topic 'add-bruce-c'Brad King2016-03-228-9/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 53c0dc2d Add support for Bruce C Compiler (BCC)
| * | | | | Add support for Bruce C Compiler (BCC)Paweł Stankowski2016-03-218-9/+36
| | |/ / / | |/| | | | | | | | | | | | | Revise C compiler detection code to be K&R compatible.
* | | | | CMake Nightly Date StampKitware Robot2016-03-221-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cpack-osx-optional-CoreServices'Brad King2016-03-212-1/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d84ba668 CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)
| * | | | CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)Brad King2016-03-182-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers on OS X report errors in the CoreServices framework headers. Check for support of the header ahead of time and compile the relevant code only when the header is available.
* | | | | Merge topic 'find-blas-lapack-OpenBLAS'Brad King2016-03-213-4/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5f6b4f69 Find{BLAS,LAPACK}: Add support for OpenBLAS (#16024)
| * | | | | Find{BLAS,LAPACK}: Add support for OpenBLAS (#16024)J M Dieterich2016-03-183-4/+36
| | |_|_|/ | |/| | | | | | | | | | | | | OpenBLAS (www.openblas.net) is the successor to GotoBLAS.
* | | | | Merge topic 'osx-no-carbon'Brad King2016-03-213-6/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 52777366 Drop unnecessary LSRequiresCarbon reference from Info.plist files
| * | | | | Drop unnecessary LSRequiresCarbon reference from Info.plist filesSean McBride2016-03-183-6/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | LSRequiresCarbon is long since unnecessary. It refers to requiring Carbon as opposed to Classic (OS 9 emulation).
* | | | | CMake Nightly Date StampKitware Robot2016-03-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2016-03-201-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-03-191-1/+1
|/ / /
* | | Merge topic 'release-win64'Brad King2016-03-187-9/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c089485d Utilities/Release: Skip spurious Qt5Autogen test for nightly binary e903a9fc Utilities/Release: Create a Windows 64-bit binary dd630075 Utilities/Release: Rename scripts to match target platform
| * | | Utilities/Release: Skip spurious Qt5Autogen test for nightly binaryBrad King2016-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This test fails spuriously too often and prevents the nightly binary from finishing. Simply skip it for the nightly binary to allow it to complete more regularly.
| * | | Utilities/Release: Create a Windows 64-bit binaryBrad King2016-03-173-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile with `-D_WIN32_WINNT=0x502` to use a WinXP-compatible API. Compile with `-D_USING_V110_SDK71_` to tell the VS standard library headers that we are building with a WinXP-compatible Windows SDK. Link executables with `-subsystem:console,5.02` to make them runnable on Windows XP 64-bit. Ideally `cmake-gui` should instead be linked with `-subsystem:windows,5.02` but with the Ninja and Makefile generators CMake adds `-subsystem:windows` after our `-subsystem:console,5.02` flag and the linker seems to interpret this combination as we need.
| * | | Utilities/Release: Rename scripts to match target platformBrad King2016-03-176-9/+8
| | | | | | | | | | | | | | | | | | | | The machine name we happen to use for the build is less informative than its platform.
* | | | Merge topic 'GenerateExportHeader-fix-name-leak'Brad King2016-03-1816-46/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 6a6e5d89 GenerateExportHeader: Allow common NO_DEPRECATED_MACRO_NAME for multiple libs be5a8973 GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)
| * | | | GenerateExportHeader: Allow common NO_DEPRECATED_MACRO_NAME for multiple libsAndreas Schuh2016-03-171-1/+3
| | | | |
| * | | | GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)Andreas Schuh2016-03-1716-45/+60
| |/ / / | | | | | | | | | | | | | | | | | | | | Previously we allowed this definition to persist outside our header. This would cause conflicts across multiple such headers because the name was always the same. Fix this by avoiding the definition altogether.
* | | | Merge topic 'cmake-gui-osx-identifier'Brad King2016-03-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7b990e82 cmake-gui: Populate CFBundleIdentifier in our Info.plist file (#16023)
| * | | | cmake-gui: Populate CFBundleIdentifier in our Info.plist file (#16023)Brad King2016-03-171-0/+1
| | |_|/ | |/| |
* | | | Merge topic 'cpack-osx-no-carbon'Brad King2016-03-182-16/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | c718070c CPack: Avoid requiring Carbon framework on OS X (#16021)
| * | | CPack: Avoid requiring Carbon framework on OS X (#16021)Sean McBride2016-03-172-16/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~232^2 (CPackDMG: Add support for multilingual SLAs, 2015-10-19) we added use of the Carbon framework in order to get access to its APIs to convert Script Manager RegionCode values. This is not necessary. Instead we can use CoreServices. While at it, replace individual CoreFoundation includes with including the entire framework, which is the correct way.
* | | Merge topic 'vs-remote-directory'Brad King2016-03-181-1/+2
|\ \ \ | | | | | | | | | | | | | | | | a3bcf2aa VS: Fix WinCE remote debugger tool per-config target name
| * | | VS: Fix WinCE remote debugger tool per-config target nameBrad King2016-03-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the DebuggerTool RemoteExecutable value added by commit a22f9967 (VS: Optionally generate remote directory for WinCE projects, 2016-02-15) to account for the configuration when computing the target name.
* | | | CMake Nightly Date StampKitware Robot2016-03-181-1/+1
| | | |
* | | | Merge topic 'ios-install-combined-one-arch'Brad King2016-03-174-1/+75
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e3fc2899 Fix iOS combined feature for single architecture targets
| * | | | Fix iOS combined feature for single architecture targetsRuslan Baratov2016-03-154-1/+75
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | If list of valid target architectures is empty for given SDK then there will be no VALID_ARCHS build setting returned by Xcode. Return "" (empty string) explicitly in this case. This may happens if CMAKE_IOS_INSTALL_COMBINED is ON but only one architecture used in target.
* | | | Merge topic 'emacs-mode-help-off-by-one'Brad King2016-03-171-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9dc384f6 cmake-mode.el: Fix help completion item lists with CMake >= 3.0 (#16019)
| * | | | cmake-mode.el: Fix help completion item lists with CMake >= 3.0 (#16019)Julian Schmidt2016-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run `cmake --help-*-list` to get a list of items for completion. Since CMake < 3.0 always printed "cmake version ..." on the first line of the output we have previously ignored the first line. However, CMake 3.0 and above do not print the version line so we should not ignore the first line or we miss one item. Ideally we should filter the first line out if it is "cmake version ..." in order to support CMake < 3.0 cleanly, but at worst the version line will show up as a completion option so simply including the first line is good enough for now.
* | | | | Merge topic 'use-GetCMakeRoot'Brad King2016-03-178-25/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3144857e Avoid depending on CMAKE_ROOT cache entry internally (#16015)
| * | | | | Avoid depending on CMAKE_ROOT cache entry internally (#16015)Brad King2016-03-168-25/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Use cmSystemTools::GetCMakeRoot() which always knows the location of our resources. Do not depend on CMAKE_ROOT because the user could unset it from the cache.
* | | | | CMake Nightly Date StampKitware Robot2016-03-171-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release'Brad King2016-03-160-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'FindBoost-optional-indirect-depends' into releaseBrad King2016-03-151-2/+12
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge topic 'FindBoost-optional-indirect-depends'Brad King2016-03-161-2/+12
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | e2f387fa FindBoost: Tolerate missing indirect dependencies (#16013)
| * | | | FindBoost: Tolerate missing indirect dependencies (#16013)Roger Leigh2016-03-151-2/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending upon the configuration, certain components may or may not be installed, for example Boost.Regex, but other components may still have header dependencies upon these components which will obviously fail to work. Since we can't make a sensible determination with the hardcoded dependency information, we choose to interpret these dependencies less strictly.