summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-compiler-id-tolerate-diagnostics'Brad King2013-10-071-1/+2
|\ | | | | | | | | 8c891f8 VS: Tolerate diagnostic output while detecting cl (#14387)
| * VS: Tolerate diagnostic output while detecting cl (#14387)Brad King2013-09-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | When the VS IDE build output setting Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project output verbosity is set to "Diagnostic" the build output contains a " (TaskId:###)" suffix on the CMAKE_<lang>_COMPILER= line used to extract the compiler executable location. Strip this suffix before checking that the reported location exists.
* | Merge topic 'deprecate-add_compiler_export_flags'Brad King2013-10-071-13/+34
|\ \ | | | | | | | | | | | | 0f3a666 GenerateExportHeader: Deprecate add_compiler_export_flags function.
| * | GenerateExportHeader: Deprecate add_compiler_export_flags function.Stephen Kelly2013-09-021-13/+34
| | | | | | | | | | | | | | | This is made obsolete by the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties.
* | | Merge topic 'FindPython_versions'Brad King2013-10-072-14/+14
|\ \ \ | | | | | | | | | | | | | | | | afd4f7f FindPython*: simplify version selection
| * | | FindPython*: simplify version selectionRolf Eike Beer2013-08-312-14/+14
| | | | | | | | | | | | | | | | | | | | CMake already provides the version components split into variables, no need to split them again.
* | | | Merge topic 'FindLua'Brad King2013-10-071-0/+153
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 89cfa20 Modules: add FindLua.cmake
| * | | | Modules: add FindLua.cmakeRolf Eike Beer2013-08-311-0/+153
| |/ / / | | | | | | | | | | | | This is a version agnostic variant of FindLua50.cmake and FindLua51.cmake.
* | | | Merge topic 'add-find_dependency-macro'Brad King2013-10-071-2/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bb501a2 CMakePackageConfigHelpers: Add a find_dependency macro
| * | | | CMakePackageConfigHelpers: Add a find_dependency macroStephen Kelly2013-08-301-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This macro handles the EXACT, REQUIRED and QUIET options and sets an appropriate NOT_FOUND_MESSAGE for the package if a dependency is not found.
* | | | | Merge topic 'rename-genex-method'Brad King2013-10-072-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cfae430 Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation
| * | | | | Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluationStephen Kelly2013-08-292-4/+4
| |/ / / /
* | | | | Merge topic 'graphviz-at-generate-time'Brad King2013-10-071-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6cf5564 Generate graphviz files at generate time, not configure time.
| * | | | | Generate graphviz files at generate time, not configure time.Stephen Kelly2013-08-291-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature needs access to all link libraries. In the future that will only be possible to calculate at generate-time. Even when the files were generated at configure time, they were generated after user code in CMakeLists files were generated. No policy is needed to handle manipulation of the files from CMake code, because that was never possible.
* | | | | Merge topic 'add-policy-version-test'Brad King2013-10-072-0/+163
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b494722 Tests: Verify policies are introduced only in "official" versions
| * | | | | Tests: Verify policies are introduced only in "official" versionsDavid Cole2013-08-282-0/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the CMake.PolicyCheck test. This test uses "git grep" to look for policies added in a "dated" version of CMake. It will fail if a policy is added as of, for example, CMake 2.8.11.20130828. The intent is to prevent such constructs from making it into an "official" release. Three instances actually appeared in the first attempted release candidate for 2.8.12. This test may sometimes yield false positives. After all, it's just using a regular expression to detect this condition, and something in a comment could possibly match it. As of right now, that's not true, but it's easy to imagine such a comment being added. The new test may also not catch all future problems of this sort. However, it will catch problems of this sort for all code that follows the present layout style in Source/cmPolicies.cxx.
* | | | | | Merge topic 'update_trilinos_contract_test'Brad King2013-10-076-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a4a584 update Trilinos contract test
| * | | | | | update Trilinos contract testZack Galbreath2013-08-286-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old version encountered a compile error on newer versions of GCC. Update to the latest supported release of Trilinos, remove the version number from the name of the Contract, and some other minor tweaks to get the test passing once more.
* | | | | | | Merge topic 'fix-style'Brad King2013-10-071-32/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5916645 Fix some indentation problems in cmPolicies.
| * | | | | | | Fix some indentation problems in cmPolicies.Stephen Kelly2013-08-281-32/+32
| |/ / / / / /
* | | | | | | Merge topic 'MAP_IMPORTED_CONFIG-property-default'Brad King2013-10-072-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb1294c cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>
| * | | | | | | cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>Stephen Kelly2013-08-282-1/+13
| |/ / / / / /
* | | | | | | Merge topic 'vs-no-regen-external-msproject'Brad King2013-10-072-11/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e478f03 VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)
| * | | | | | | VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)Brad King2013-08-282-11/+14
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMAKE_SUPPRESS_REGENERATION tells us not to create the ZERO_CHECK target we should not add dependencies on it from other targets either. Reviewed-by: Mateusz Loskot <mateusz@loskot.net>
* | | | | | | Merge topic 'PLATFORM_ID-genex'Brad King2013-10-074-0/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcc00ec Genex: Add the PLATFORM_ID expression.
| * | | | | | | Genex: Add the PLATFORM_ID expression.Stephen Kelly2013-08-284-0/+51
| | | | | | | |
* | | | | | | | Merge topic 'automoc-gadget'Brad King2013-10-074-15/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d4937da Search for the Q_GADGET macro for running automoc too.
| * | | | | | | | Search for the Q_GADGET macro for running automoc too.Stephen Kelly2013-08-284-15/+55
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'ADDITIONAL_MAKE_CLEAN_FILES-genex'Brad King2013-10-072-1/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d26594f Genex: Evaluate genexes for additional make clean files.
| * | | | | | | | Genex: Evaluate genexes for additional make clean files.Stephen Kelly2013-08-272-1/+21
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary because custom commands and targets may create custom files whose names are determined by generator expressions. For example, clang should be using $<TARGET_FILE> and $<TARGET_FILE_DIR> instead of reverse engineering the output file name: http://thread.gmane.org/gmane.comp.compilers.clang.scm/80523 However, that can only be done when ADDITIONAL_MAKE_CLEAN_FILES also accepts and evaluates generator expressions. Similarly, KDE uses the LOCATION property where $<TARGET_FILE> would also be better in KDE4_HANDLE_RPATH_FOR_EXECUTABLE but also appends the result to ADDITIONAL_MAKE_CLEAN_FILES. After this patch, both can be ported to generator expressions.
* | | | | | | | Merge topic 'fix-reset-compiler'Brad King2013-10-071-2/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b2a2db Fix resetting the compiler on the command line (#14366).
| * | | | | | | | Fix resetting the compiler on the command line (#14366).Stephen Kelly2013-08-191-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the incoming value to a path in the same way that the already-cached value was converted before comparison. Do the actual comparison only one time, after both values are normalized.
* | | | | | | | | Merge topic 'FortranCInterface-cross-compile'Brad King2013-10-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7a65a2 FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)
| * | | | | | | | | FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)Michel Zou2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After building the test binary tell find_program to search for it with the ${CMAKE_EXECUTABLE_SUFFIX} so that the .exe can be found. Since find_program is normally used to locate host tools while cross-compiling it needs this hint to find the target binary. Suggested-by: Denis Barbier <bouzim@gmail.com>
* | | | | | | | | | Merge topic 'remove-local-typedef'Brad King2013-10-071-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a7fecc remove unused local typedef
| * | | | | | | | | | remove unused local typedefRolf Eike Beer2013-08-141-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes this warning from g++ 4.8: CMake/Source/cmDocumentation.cxx:835:23: warning: typedef 'sdoc_t' locally defined but not used [-Wunused-local-typedefs] SDOC_UNKNOWN} sdoc_t; ^
* | | | | | | | | | Merge topic 'no-duplicate-find-tests'Brad King2013-10-071-2/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796c618 blacklist tests with their own test in Tests/Module from AllFindModules test
| * | | | | | | | | | blacklist tests with their own test in Tests/Module from AllFindModules testRolf Eike Beer2013-08-091-2/+9
| | | | | | | | | | |
* | | | | | | | | | | Begin post-2.8.12 developmentBrad King2013-10-071-2/+2
| | | | | | | | | | |
* | | | | | | | | | | CMake 2.8.12v2.8.12Brad King2013-10-072-1/+12
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'release'Brad King2013-10-073-4/+568
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CMake 2.8.12-rc4Brad King2013-10-012-1/+26
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'release'Brad King2013-10-013-4/+543
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | CMake 2.8.12-rc3Robert Maynard2013-09-092-1/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'release'Robert Maynard2013-09-093-4/+538
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | CMake 2.8.12-rc2Robert Maynard2013-08-302-1/+37
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'release'Robert Maynard2013-08-303-4/+502
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | CMake 2.8.12-rc1Brad King2013-08-153-4/+502
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge topic 'fix-install-include-dirs-processing'Brad King2013-10-072-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f98f4a Genex: Fix processing multiple include directories for relative paths
| * | | | | | | | | | | | | | | Genex: Fix processing multiple include directories for relative pathsStephen Kelly2013-10-072-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-insert the semicolon which was removed during splitting. Commit d777b8e7 (Genex: Allow relative paths in INSTALL_INTERFACE., 2013-07-25) introduced the prefixItems method to allow relative paths in the argument of the INSTALL_INTERFACE expression. That method was buggy in that it did not re-introduce the semicolon separator in the result. This bug also affects paths which are already absolute in user code.