summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'KateFixNinja'Brad King2013-12-192-57/+24
|\ | | | | | | | | | | c3d20c2 kate: fix ninja support 1eaf2f2 kate: remove unused function
| * kate: fix ninja supportAlex Neundorf2013-12-192-11/+24
| | | | | | | | | | | | | | ninja needs to be run from the toplevel build dir, not from the target dir, as make Alex
| * kate: remove unused functionAlex Neundorf2013-12-192-46/+0
| | | | | | | | Alex
* | Merge topic 'fix-INTERFACE-mapped-config'Brad King2013-12-195-2/+35
|\ \ | | | | | | | | | | | | 3b8e56a Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)
| * | Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)Stephen Kelly2013-12-095-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | The INTERFACE_LIBRARY type does not have any LOCATION at all, so return early from GetMappedConfig. GetMappedConfig is called from two locations, one of which already pre-checks the INTERFACE_LIBRARY case. Remove that pre-check and handle that case inside the method instead.
* | | Merge topic 'libarchive-left-shift-fix'Brad King2013-12-191-20/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | 0bff4df libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffix 61b39af libarchive: Port upstream issue 320 second fix
| * | | libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffixBrad King2013-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | The macro maps to an implementation that works on older compilers when necessary.
| * | | libarchive: Port upstream issue 320 second fixBrad King2013-12-091-20/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Port upstream commit 6cf33c93 (Issue 320: Rewrite (again) to avoid the left shift that CLang dislikes so much, 2013-12-07) into CMake. Inspired-by: Tim Kientzle <kientzle@freebsd.org>
* | | | Merge topic 'vtk-contract'Brad King2013-12-191-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ad330ed Tests/Contracts: Submit notes with VTK build
| * | | | Tests/Contracts: Submit notes with VTK buildZack Galbreath2013-12-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Submit the configured Dashboard script as as Notes file to CDash. Also add comments about the origin & purpose of this test.
* | | | | Merge topic 'FindFreetype-2.5'Brad King2013-12-191-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b08e3f FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS bc49d82 FindFreetype: Detect version string with Freetype 2.5 7435ae7 FindFreetype: Find ftheader.h with Freetype 2.5
| * | | | | FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRSDaniele E. Domenichelli2013-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Freetype 2.5 the paths for FREETYPE_INCLUDE_DIR_ft2build and FREETYPE_INCLUDE_DIR_freetype2 are the same
| * | | | | FindFreetype: Detect version string with Freetype 2.5Daniele E. Domenichelli2013-12-091-2/+8
| | | | | |
| * | | | | FindFreetype: Find ftheader.h with Freetype 2.5Daniele E. Domenichelli2013-12-091-1/+4
| | | | | |
* | | | | | Merge topic 'xcode-5.1'Brad King2013-12-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65ee85d CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
| * | | | | | CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1Ted Kremenek2013-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 5.1 output no longer puts "./" in the path to the linker output for the CompilerId test binary. Update our regex to match the path with or without the component.
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-191-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-181-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-171-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-151-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-141-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-131-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-121-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-111-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-12-101-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'vtk-contract'Brad King2013-12-092-4/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | ca9e117 Tests/Contracts: Fix failing VTK Contract test
| * | | | Tests/Contracts: Fix failing VTK Contract testZack Galbreath2013-12-092-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | This test was failing because it was attempting to build VTK in the wrong directory.
* | | | | Merge topic 'INTERFACE_AUTOUIC_OPTIONS'Brad King2013-12-0916-140/+360
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77f3772 cmTarget: Require a compatible INTERFACE_AUTOUIC_OPTIONS from dependencies. 2e60b5f cmTarget: Report origin of COMPATIBLE_INTERFACE properties.
| * | | | | cmTarget: Require a compatible INTERFACE_AUTOUIC_OPTIONS from dependencies.Stephen Kelly2013-12-088-144/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the origin-tracking infrastructure from commit 98093c45 (QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property., 2013-11-20). Use the compatibility-tracking for compatible strings instead. If two different dependencies require different AUTOUIC_OPTIONS, cmake will now appropriately issue an error.
| * | | | | cmTarget: Report origin of COMPATIBLE_INTERFACE properties.Stephen Kelly2013-12-0811-3/+298
| | | | | |
* | | | | | Merge topic 'unicode-win32-apis'Brad King2013-12-099-78/+107
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b9906c Windows: Use wide-character system APIs
| * | | | | | Windows: Use wide-character system APIsClinton Stimpson2013-12-099-78/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CMake compile with -DUNICODE. Make it possible for the 8 bit encoding to eventually be UTF-8 instead ANSI.
* | | | | | | Merge topic 'qt4-qmake-exe'Brad King2013-12-091-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05c518b FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
| * | | | | | | FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.Simon Sasburg2013-12-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression in commit 21123416 where it was trying to better handle a qmake from Qt5.
* | | | | | | | Merge topic 'mingw-gfortran-sizeof-dptr'Brad King2013-12-091-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 5da1580 Fortran: Improve pointer size detection in gfortran on MinGW
| * | | | | | | Fortran: Improve pointer size detection in gfortran on MinGWBrad King2013-12-061-0/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ecd84147 (Fortran: Detect pointer size in gfortran on MinGW, 2011-11-29) we started testing for __SIZEOF_POINTER__ but not all GNU Fortran compilers define this. Check also for __SIZEOF_SIZE_T__ which at least one version of gfortran defines without also defining __SIZEOF_POINTER__.
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-091-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-071-1/+1
| | | | | | |
* | | | | | | Merge topic 'cleanup-build-commands'Brad King2013-12-063-1/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | ef7c11e Tests: Fix standalone build of tests with nested projects
| * | | | | | Tests: Fix standalone build of tests with nested projectsBrad King2013-12-053-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit fd6076d0 (Tests: Pass CMAKE_MAKE_PROGRAM instead of --build-makeprogram, 2013-11-15) the ExportImport, Fortran, and MacRuntimePath tests use the value of CMAKE_TEST_MAKEPROGRAM as the CMAKE_MAKE_PROGRAM for their nested projects configurations. Teach these tests to initialize CMAKE_TEST_MAKEPROGRAM when it is not provided, such as when building the tests manually.
* | | | | | | CMake Nightly Date StampKitware Robot2013-12-061-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'doc-source_group-FILES'Brad King2013-12-051-14/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0060e95 Help: Format and clarify source_group() documentation (#14631)
| * | | | | | Help: Format and clarify source_group() documentation (#14631)Brad King2013-12-051-14/+30
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Refine the .rst formatting. Document the FILES option explicitly and specify how it treats relative paths.
* | | | | | Merge topic 'vtk-contract'Brad King2013-12-055-31/+79
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | 1b173f2 Tests/Contracts: Update test for VTK release branch
| * | | | | Tests/Contracts: Update test for VTK release branchZack Galbreath2013-12-055-31/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plan is to reinstate the VTK contracts test so that CMake & VTK devs will both be made aware when a change in CMake causes build problems for VTK.
* | | | | | Merge topic 'minor-cleanups'Brad King2013-12-054-8/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 259bf09 Make the cmStrictTargetComparison operate on const cmTarget*. 8cc3cdb Help: Fix up the VISIBILITY_INLINES_HIDDEN docs. 1396ab8 Don't generate self-references for system include directories.
| * | | | | | Make the cmStrictTargetComparison operate on const cmTarget*.Stephen Kelly2013-12-042-2/+3
| | | | | | |
| * | | | | | Help: Fix up the VISIBILITY_INLINES_HIDDEN docs.Stephen Kelly2013-12-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve some sentence fragments, remove a copy-pasto from other docs and use a link to the CMAKE_VISIBILITY_INLINES_HIDDEN variable.