Commit Graph

22773 Commits

Author SHA1 Message Date
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
Brad King e4201248ce CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND
In the code path for launching the VS IDE tools, avoid using
CMAKE_MAKE_PROGRAM.  Instead use the variables CMAKE_VS_DEVENV_COMMAND,
CMAKE_VS_MSBUILD_COMMAND, and CMAKE_VS_MSDEV_COMMAND to lookup the
location of the build tool needed.  Choose the proper tool based on
availability and necessity for the language (e.g. Intel Fortran must
build with devenv.com and not MSBuild.exe).
2013-12-04 11:06:44 -05:00
Brad King 0c55729c13 VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables
Since commit 5f5c92b9 (VS: Add internal APIs to find MSBuild,
devenv/VCExpress, and msdev, 2013-11-13) the VS generators have
known how to lookup the locations of their build tools directly.
Expose this information to CMake language code by defining new
variables to hold the paths to these tools.
2013-12-04 11:05:05 -05:00
Brad King a5c3f059ff Merge topic 'fix-export-segfault'
1cd1430 export(): Check targets exist at configure-time (#14608)
2013-12-04 08:33:36 -05:00
Stephen Kelly 1cd1430b1f export(): Check targets exist at configure-time (#14608)
Commit 66b290e7 (export(): Process the export() command at generate
time., 2012-10-06 ) refactored export() so that it could evaluate
strings at generate-time. This was intended for evaluating target
properties, but that commit also removed a check for target
existence at configure-time. Restore that check and add a test for
this case.
2013-12-04 08:30:26 -05:00
Stephen Kelly 259bf0918c Make the cmStrictTargetComparison operate on const cmTarget*. 2013-12-04 13:43:30 +01:00
Kitware Robot f1ec923d1a CMake Nightly Date Stamp 2013-12-04 00:01:09 -05:00
Brad King 07528f78d7 Merge topic 'filter-showincludes-in-launcher'
e5e3f3d CTest: filter /showIncludes output from ninja compile launcher
2013-12-03 09:48:09 -05:00
Brad King a6b45087a1 Merge topic 'cmake-toolchains-manual'
c45b5ce Help: Add cmake-toolchains.7 manual
3e3f8b4 Help: Document the CMAKE_FIND_ROOT_PATH* variables.
531c108 Help: Document the CMAKE_TOOLCHAIN_FILE.
2013-12-03 09:45:28 -05:00
Stephen Kelly c45b5ceb66 Help: Add cmake-toolchains.7 manual
Create a manual for toolchain related docs.
2013-12-03 09:44:31 -05:00
Brad King 1af0c41278 Merge topic 'Haiku-CPU-count'
eef42a0 ProcessorCount: make it work on Haiku
2013-12-03 09:30:31 -05:00
Brad King 2e8ce4d516 Merge topic 'lang-flag-var-helpstrings'
5d2452d Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)
2b77b53 Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606)
424c6fc Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)
2013-12-03 09:30:27 -05:00
Brad King 8a891b1ecc Merge topic 'cmake-mt-return-value'
d384b5a cmake: Fix mt return value when hosted on posix (#14605)
2013-12-03 09:30:23 -05:00
Brad King da47c9733b Merge topic 'osx-cross-compile-fixup'
3189ed3 OS X: Fix app bundle search path during cross compiling (#14603)
2013-12-03 09:30:18 -05:00
Brad King c1612dbd23 Merge topic 'xcode-folder-dedup'
2dcb1dc Xcode: Fix duplicate target subfolders (#14133)
2013-12-03 09:30:14 -05:00
Nils Gladitz e5e3f3d4ff CTest: filter /showIncludes output from ninja compile launcher
Teach "ctest --launch" a new "--filter-prefix" option.  Set it using
the CMAKE_CL_SHOWINCLUDES_PREFIX value with the Ninja generator.
2013-12-03 09:25:53 -05:00
Brad King 5d2452d89a Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)
s/defalut/default/

Reported-by: Stephan Tolksdorf <st@quanttec.com>
2013-12-03 09:21:33 -05:00
Stephen Kelly 8cc3cdb614 Help: Fix up the VISIBILITY_INLINES_HIDDEN docs.
Resolve some sentence fragments, remove a copy-pasto from other docs
and use a link to the CMAKE_VISIBILITY_INLINES_HIDDEN variable.
2013-12-03 11:19:07 +01:00
Stephen Kelly 1396ab8009 Don't generate self-references for system include directories.
Targets which link directly to themselves should not result in
generate-time errors (reported by the DAG checker).

Self-links are handled separately with policy CMP0038.
2013-12-03 11:13:42 +01:00
Kitware Robot b92dc10428 CMake Nightly Date Stamp 2013-12-03 00:01:08 -05:00
Brad King 65fb49ba35 Merge topic 'doc-pdb-not-for-static-libs'
c0897cf Help: Document PDB behavior w.r.t. static libraries explicitly (#14600)
09c05f3 Help: Format PDB_NAME and PDB_OUTPUT_DIRECTORY documentation
cb7b907 Help: Document CMAKE_PDB_OUTPUT_DIRECTORY_<CONFIG> variable
2013-12-02 12:07:50 -05:00
Brad King fab69a3db9 Merge topic 'use-generator-target'
02a545c Don't generate subdir convenience rules for IMPORTED targets.
2013-12-02 12:07:41 -05:00
Brad King ea8d1a9cca Merge topic 'INTERFACE_AUTOUIC_OPTIONS'
98093c4 QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property.
02542b4 QtAutoUic: Handle new -include command line parameter.
1242f4e Genex: Add {UPPER,LOWER}_CASE and MAKE_C_IDENTIFIER.
754b321 QtAutogen: Use config without prefix in map key.
2013-12-02 12:07:31 -05:00