kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,745 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

22745 Commits

Author SHA1 Message Date
Brad King 33498bba9c Merge topic 'KateFixNinja' 
c3d20c2 kate: fix ninja support
1eaf2f2 kate: remove unused function
 2013-12-19 10:12:49 -05:00
Brad King a1e58db675 Merge topic 'fix-INTERFACE-mapped-config' 
3b8e56a Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636)
 2013-12-19 10:12:42 -05:00
Brad King bddc437d35 Merge topic 'libarchive-left-shift-fix' 
0bff4df libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffix
61b39af libarchive: Port upstream issue 320 second fix
 2013-12-19 10:12:37 -05:00
Brad King e15b14d431 Merge topic 'vtk-contract' 
ad330ed Tests/Contracts: Submit notes with VTK build
 2013-12-19 10:12:29 -05:00
Brad King 172f37be33 Merge topic 'FindFreetype-2.5' 
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
 2013-12-19 10:12:25 -05:00
Brad King b891af9290 Merge topic 'xcode-5.1' 
65ee85d CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
 2013-12-19 10:12:18 -05:00
Alex Neundorf c3d20c2ac9 kate: fix ninja support 
ninja needs to be run from the toplevel build dir,
not from the target dir, as make

Alex
 2013-12-19 10:04:00 -05:00
Alex Neundorf 1eaf2f263b kate: remove unused function 
Alex
 2013-12-19 10:03:34 -05:00
Zack Galbreath ad330edaa2 Tests/Contracts: Submit notes with VTK build 
Submit the configured Dashboard script as as Notes file to CDash.
Also add comments about the origin & purpose of this test.
 2013-12-19 10:01:14 -05:00
Kitware Robot 2f0ff16418 CMake Nightly Date Stamp 2013-12-19 00:01:06 -05:00
Kitware Robot 2a384e08cc CMake Nightly Date Stamp 2013-12-18 00:01:09 -05:00
Kitware Robot 400ce73e0f CMake Nightly Date Stamp 2013-12-17 00:01:05 -05:00
Kitware Robot b4fdbba55a CMake Nightly Date Stamp 2013-12-16 00:01:07 -05:00
Kitware Robot 5cd2e0fc44 CMake Nightly Date Stamp 2013-12-15 00:01:08 -05:00
Kitware Robot c9ca4a7142 CMake Nightly Date Stamp 2013-12-14 00:01:09 -05:00
Kitware Robot 5e43d6d3d0 CMake Nightly Date Stamp 2013-12-13 00:01:07 -05:00
Kitware Robot edaef237bf CMake Nightly Date Stamp 2013-12-12 00:01:08 -05:00
Kitware Robot 62b90453d7 CMake Nightly Date Stamp 2013-12-11 00:01:08 -05:00
Kitware Robot a2489ce49c CMake Nightly Date Stamp 2013-12-10 00:01:08 -05:00
Stephen Kelly 3b8e56a50f Don't search for IMPORTED_LOCATION of INTERFACE_LIBRARY (14636) 
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.
 2013-12-09 20:52:52 +01:00
Brad King 0bff4df5f6 libarchive: Use ARCHIVE_LITERAL_ULL to add ULL integer suffix 
The macro maps to an implementation that works on older compilers
when necessary.
 2013-12-09 14:04:24 -05:00
Daniele E. Domenichelli 9b08e3f599 FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS 
In Freetype 2.5 the paths for FREETYPE_INCLUDE_DIR_ft2build and
FREETYPE_INCLUDE_DIR_freetype2 are the same
 2013-12-09 19:39:28 +01:00
Daniele E. Domenichelli bc49d820a2 FindFreetype: Detect version string with Freetype 2.5 2013-12-09 19:33:42 +01:00
Brad King 61b39af353 libarchive: Port upstream issue 320 second fix 
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>
 2013-12-09 12:55:21 -05:00
Ted Kremenek 65ee85d0c5 CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.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.
 2013-12-09 10:40:42 -05:00
Brad King 330af68ed4 Merge topic 'vtk-contract' 
ca9e117 Tests/Contracts: Fix failing VTK Contract test
 2013-12-09 10:35:58 -05:00
Brad King 5026696fcc Merge topic 'INTERFACE_AUTOUIC_OPTIONS' 
77f3772 cmTarget: Require a compatible INTERFACE_AUTOUIC_OPTIONS from dependencies.
2e60b5f cmTarget: Report origin of COMPATIBLE_INTERFACE properties.
 2013-12-09 10:33:30 -05:00
Brad King 1ab140ef8f Merge topic 'unicode-win32-apis' 
0b9906c Windows: Use wide-character system APIs
 2013-12-09 10:33:24 -05:00
Brad King 1c95ec6316 Merge topic 'qt4-qmake-exe' 
05c518b FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
 2013-12-09 10:33:11 -05:00
Brad King cedf03b307 Merge topic 'mingw-gfortran-sizeof-dptr' 
5da1580 Fortran: Improve pointer size detection in gfortran on MinGW
 2013-12-09 10:33:08 -05:00
Clinton Stimpson 0b9906c2fb Windows: Use wide-character system APIs 
Make CMake compile with -DUNICODE.  Make it possible for the 8 bit
encoding to eventually be UTF-8 instead ANSI.
 2013-12-09 10:29:43 -05:00
Zack Galbreath ca9e11727b Tests/Contracts: Fix failing VTK Contract test 
This test was failing because it was attempting to build VTK in the
wrong directory.
 2013-12-09 10:27:55 -05:00
Daniele E. Domenichelli 7435ae7c97 FindFreetype: Find ftheader.h with Freetype 2.5 2013-12-09 13:24:28 +01:00
Kitware Robot 0ea589fdfc CMake Nightly Date Stamp 2013-12-09 00:01:09 -05:00
Stephen Kelly 77f3772784 cmTarget: Require a compatible INTERFACE_AUTOUIC_OPTIONS from dependencies. 
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.
 2013-12-08 07:03:29 +01:00
Stephen Kelly 2e60b5fcf7 cmTarget: Report origin of COMPATIBLE_INTERFACE properties. 2013-12-08 07:03:29 +01:00
Kitware Robot 68963b0469 CMake Nightly Date Stamp 2013-12-08 00:01:06 -05:00
Kitware Robot 6f6eec1ff6 CMake Nightly Date Stamp 2013-12-07 00:01:10 -05:00
Brad King 8ee6f3199a Merge topic 'cleanup-build-commands' 
ef7c11e Tests: Fix standalone build of tests with nested projects
 2013-12-06 15:52:41 -05:00
Simon Sasburg 05c518b3de FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly. 
This fixes a regression in commit 21123416 where it was trying to better handle
a qmake from Qt5.
 2013-12-06 08:07:38 -07:00
Brad King 5da1580ada Fortran: Improve pointer size detection in gfortran on MinGW 
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__.
 2013-12-06 09:02:27 -05:00
Kitware Robot ce598cc838 CMake Nightly Date Stamp 2013-12-06 00:01:09 -05:00
Brad King 148a506e33 Merge topic 'doc-source_group-FILES' 
0060e95 Help: Format and clarify source_group() documentation (#14631)
 2013-12-05 13:33:13 -05:00
Brad King 0060e955db Help: Format and clarify source_group() documentation (#14631) 
Refine the .rst formatting.  Document the FILES option explicitly
and specify how it treats relative paths.
 2013-12-05 13:22:57 -05:00
Brad King ef7c11ee31 Tests: Fix standalone build of tests with nested projects 
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.
 2013-12-05 12:52:11 -05:00
Brad King e1af1d3592 Merge topic 'vtk-contract' 
1b173f2 Tests/Contracts: Update test for VTK release branch
 2013-12-05 09:26:51 -05:00
Zack Galbreath 1b173f25b4 Tests/Contracts: Update test for VTK release branch 
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.
 2013-12-05 09:26:00 -05:00
Brad King 998d7c8f4a Merge topic 'minor-cleanups' 
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.
 2013-12-05 09:25:34 -05:00
Brad King 520ead7200 Merge topic 'cleanup-build-commands' 
e420124 CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND
0c55729 VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables
 2013-12-05 09:24:59 -05:00
Kitware Robot 7974dbb0ff CMake Nightly Date Stamp 2013-12-05 00:01:08 -05:00