summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'tests-no-match-full-path'Brad King2015-07-15119-285/+266
|\ | | | | | | | | | | e5ca59b4 Tests: Move command failure cases into RunCMake infrastructure 0699e0d3 Tests: Move CTestTestConfigFileInBuildDir into RunCMake.ctest_start
| * Tests: Move command failure cases into RunCMake infrastructureBrad King2015-07-14111-204/+239
| | | | | | | | | | | | | | Move failure cases from the CMake.{If,List,While,GetProperty} tests over to the RunCMake.{if,list,while,get_property} tests to use the more modern infrastructure. This also avoids using REGEX_ESCAPE_STRING to try to regex-match full paths.
| * Tests: Move CTestTestConfigFileInBuildDir into RunCMake.ctest_startBrad King2015-07-148-81/+27
| | | | | | | | | | | | | | Subsume the CTestTestConfigFileInBuildDir test cases into the RunCMake.ctest_start test as new cases to avoid infrastructure duplication. This also avoids using REGEX_ESCAPE_STRING to try to regex-match full paths.
* | CMake Nightly Date StampKitware Robot2015-07-151-1/+1
| |
* | Merge topic 'coverage_no_tests'Brad King2015-07-141-1/+1
|\ \ | | | | | | | | | | | | e6cf1c48 ctest_coverage: Always do coverage for CTEST_EXTRA_COVERAGE_GLOB
| * | ctest_coverage: Always do coverage for CTEST_EXTRA_COVERAGE_GLOBZack Galbreath2015-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Do not ignore a coverage request if CTEST_EXTRA_COVERAGE_GLOB was specified. Prior to this change, if no lines of code were covered by any tests then CTest would neglect to generate a Coverage.xml file. This change allows us to report uncovered files for a project with no tests.
* | | Merge topic 'refactor-rule-var-includes'Brad King2015-07-1444-75/+104
|\ \ \ | | | | | | | | | | | | | | | | | | | | c736de7b Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables 6f94b03c Place <DEFINES> before <FLAGS> consistently across compilers
| * | | Factor an <INCLUDES> placeholder out of <FLAGS> in rule variablesBrad King2015-07-1344-75/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Makefile and Ninja generators to substitute for an <INCLUDES> placeholder instead of putting -I in <FLAGS>. Update our values for CMAKE_<LANG>_COMPILE_OBJECT, CMAKE_<LANG>_CREATE_ASSEMBLY_SOURCE, and CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE to place <INCLUDES> just before <FLAGS>.
| * | | Place <DEFINES> before <FLAGS> consistently across compilersBrad King2015-07-136-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our values for CMAKE_<LANG>_COMPILE_OBJECT, CMAKE_<LANG>_CREATE_ASSEMBLY_SOURCE, and CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE to place <DEFINES> before <FLAGS> consistently across supported compilers. We already do this for most compilers, so update the rest for consistency.
* | | | Merge topic 'FindXercesC-versioned-library-2'Brad King2015-07-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 38ddabb1 FindXercesC: Also search for xerces-c_2 (#15648)
| * | | | FindXercesC: Also search for xerces-c_2 (#15648)Roger Leigh2015-07-131-1/+1
| | |_|/ | |/| | | | | | | | | | This is the previous stable release name used on Windows.
* | | | Merge topic 'factor-out-common-generator'Brad King2015-07-141-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 80d75246 cmNinjaTargetGenerator: Restore addition of Fortran format flags
| * | | | cmNinjaTargetGenerator: Restore addition of Fortran format flagsBrad King2015-07-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore call to AppendFortranFormatFlags accidentally dropped by commit 0837538e (cmCommonTargetGenerator: Adopt GetFlags method, 2015-07-09). It was added originally by commit 6a56740e (cmNinjaTargetGenerator: Add Fortran flag generation, 2015-07-09).
* | | | | CMake Nightly Date StampKitware Robot2015-07-141-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2015-07-130-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | CMake 3.3.0-rc4v3.3.0-rc4Brad King2015-07-131-1/+1
| | | | |
* | | | | Merge branch 'release'Brad King2015-07-130-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'fix-command-rename' into releaseBrad King2015-07-132-0/+18
| |\ \ \ \
| * \ \ \ \ Merge branch 'FindMPI-Intel-5' into releaseBrad King2015-07-131-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cpack-ifw-framework-version' into releaseBrad King2015-07-081-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'empty-LINK_LIBRARIES' into releaseBrad King2015-07-085-6/+26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'CheckCompilerFlag-do-not-use-FLAGS' into releaseBrad King2015-07-084-12/+19
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'fix-command-rename'Brad King2015-07-132-0/+18
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d4f032b5 cmState: Restore renamed commands on cleanup.
| * | | | | | | | | cmState: Restore renamed commands on cleanup.Stephen Kelly2015-07-122-0/+18
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.3.0-rc1~196^2~7 (cmake: Simplify command clean up loop., 2015-04-12) introduced a bug that built-in commands which were renamed no longer had their original name restored when cleanup is performed between configure runs. Check for that and restore the commands with their original name. Extend the complex test for this. That test is run by ctest with the --build-two-config command line option.
* | | | | | | | | Merge topic 'FindMPI-Intel-5'Brad King2015-07-131-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | cfd23d3f FindMPI: Extend Intel-MPI 5+ workaround for recent GCCs
| * | | | | | | | FindMPI: Extend Intel-MPI 5+ workaround for recent GCCsSean Brennan2015-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the workaround added by commit v3.2.0-rc1~278^2 (FindMPI: Workaround Intel MPI 5.0.1 exit code problem, 2014-12-04) with an additional/alternate keyword to recognize the case with recent GCCs.
* | | | | | | | | Merge topic 'update-prebuilt-openssl'Brad King2015-07-132-6/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | fbd7fd0f Utilities/Release: Update to openssl-1.0.2d
| * | | | | | | | Utilities/Release: Update to openssl-1.0.2dBrad King2015-07-102-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-07-131-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-07-121-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-07-111-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'update-kwsys'Brad King2015-07-100-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0cd7324 Merge branch 'upstream-kwsys' into update-kwsys abeee541 KWSys 2015-07-08 (d3ba91e1)
| * \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-07-100-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | KWSys 2015-07-08 (d3ba91e1)KWSys Robot2015-07-102-681/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d3ba91e1 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 8504e845..d3ba91e1 Brad King (1): d3ba91e1 System: Drop Shell_* APIs
* | | | | | | | | | Merge topic 'autorcc-qt-5.1'Brad King2015-07-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a271e13 cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
| * | | | | | | | | | cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)Brad King2015-07-091-1/+1
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input changes, 2014-09-17) we added use of the rcc "--list" option. Prior to Qt 5.2 this option was called just "-list", and the older name is still supported by the newer tools. Use the older name of the option for compatibility with Qt 5.0 and 5.1.
* | | | | | | | | | Merge topic 'OUTPUT_NAME-genex'Brad King2015-07-109-9/+49
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 809159c9 Add generator expression support to OUTPUT_NAME target property 9a1ef0dc Help: Improve OUTPUT_NAME documentation formatting
| * | | | | | | | | | Add generator expression support to OUTPUT_NAME target propertyRobert Goulet2015-07-097-6/+34
| | | | | | | | | | |
| * | | | | | | | | | Help: Improve OUTPUT_NAME documentation formattingBrad King2015-07-093-3/+15
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also link to its variants.
* | | | | | | | | | Merge topic 'factor-out-common-generator'Brad King2015-07-1020-581/+646
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fed5eb5b cmNinjaTargetGenerator: Use GetDefines method eacacacd cmCommonTargetGenerator: Adopt GetDefines method 0837538e cmCommonTargetGenerator: Adopt GetFlags method f4875bbd cmNinjaTargetGenerator: Add OX X framework flags 7891f5d7 cmMakefileTargetGenerator: Fix comment typo 73bfad72 cmNinjaTargetGenerator: Factor out AddIncludeFlags helper 6a56740e cmNinjaTargetGenerator: Add Fortran flag generation 058074d4 cmCommonTargetGenerator: Adopt GetFrameworkFlags ab824018 cmCommonTargetGenerator: Adopt AppendFortranFormatFlags 0b22c0b8 cmCommonTargetGenerator: Adopt AddFortranFlags and friends b2f51aef cmCommonTargetGenerator: Adopt Convert method cdb5b657 cmCommonTargetGenerator: Adopt ModuleDefinitionFile member beee7937 cmCommonTargetGenerator: Adopt GetFeature and friends abfa5f2d cmCommonTargetGenerator: Adopt ConfigName member 9d41f6d8 cmLocalCommonGenerator: Adopt ConfigName member a4a2518d cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessor ...
| * | | | | | | | cmNinjaTargetGenerator: Use GetDefines methodBrad King2015-07-091-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the per-source ComputeDefines implementation by getting target-wide defines from GetDefines. Technically this changes behavior by no-longer de-duplicating/sorting defines from both the target and the source, but this makes it consistent with the Makefile generator. It may also later help move target-wide defines into per-target compilation rules.
| * | | | | | | | cmCommonTargetGenerator: Adopt GetDefines methodBrad King2015-07-094-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the member up from cmMakefileTargetGenerator so it can be re-used later by cmNinjaTargetGenerator.
| * | | | | | | | cmCommonTargetGenerator: Adopt GetFlags methodBrad King2015-07-096-103/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | De-duplicate per-target flag computation in Makefile and Ninja target generators.
| * | | | | | | | cmNinjaTargetGenerator: Add OX X framework flagsBrad King2015-07-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach ComputeFlagsForObject to add -F flags just like the Makefile generator does.
| * | | | | | | | cmMakefileTargetGenerator: Fix comment typoBrad King2015-07-091-1/+1
| | | | | | | | |
| * | | | | | | | cmNinjaTargetGenerator: Factor out AddIncludeFlags helperBrad King2015-07-092-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor an AddIncludeFlags method out of ComputeFlagsForObject just like cmMakefileTargetGenerator has already.
| * | | | | | | | cmNinjaTargetGenerator: Add Fortran flag generationBrad King2015-07-091-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ComputeFlagsForObject consistent with the Makefile generator in regard to Fortran flags.
| * | | | | | | | cmCommonTargetGenerator: Adopt GetFrameworkFlagsBrad King2015-07-094-64/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the member up from cmMakefileTargetGenerator.
| * | | | | | | | cmCommonTargetGenerator: Adopt AppendFortranFormatFlagsBrad King2015-07-094-32/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move up from cmMakefileTargetGenerator.
| * | | | | | | | cmCommonTargetGenerator: Adopt AddFortranFlags and friendsBrad King2015-07-094-104/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move AddFortranFlags, GetFortranModuleDirectory, and supporting members up from cmMakefileTargetGenerator.
generated by cgit v0.12 at 2025-02-03 02:10:26 (GMT)