summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Remove GetProperties method.Stephen Kelly2015-07-181-3/+0
| | | | The storage details of properties do not belong in the API.
* cmMakefile: Add a PropertyKeys accessor.Stephen Kelly2015-07-183-7/+22
|
* CMake Nightly Date StampKitware Robot2015-07-181-1/+1
|
* Merge topic 'ctest-change-id'Brad King2015-07-172-0/+13
|\ | | | | | | | | 601ff0ec CTest: Optionally add a ChangeId attribute on XML Site tags
| * CTest: Optionally add a ChangeId attribute on XML Site tagsZack Galbreath2015-07-172-0/+13
| | | | | | | | | | | | | | Add variable CTEST_CHANGE_ID to configure the setting. This allows CTest clients to give CDash information about what change is being tested so that CDash can take actions to report the results (e.g. to a pull request page).
* | CMake Nightly Date StampKitware Robot2015-07-171-1/+1
| |
* | CMake Nightly Date StampKitware Robot2015-07-161-1/+1
| |
* | Merge topic 'update-kwsys'Brad King2015-07-152-16/+45
|\ \ | | | | | | | | | | | | | | | 540f0253 Merge branch 'upstream-kwsys' into update-kwsys dc822da8 KWSys 2015-07-10 (c9336bcf)
| * | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-07-152-16/+45
| | |
* | | Merge topic 'makefile-target-messages'Brad King2015-07-151-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f0cad193 Tests: Add test for TARGET_MESSAGES global property 1d398478 Makefile: Optionally disable target completion messages in build output d560b46f CMakeGenericSystem: Recognize Watcom WMake generator as Makefile generator
| * | | Makefile: Optionally disable target completion messages in build outputMichael Ensslin2015-07-141-2/+14
| | |/ | |/| | | | | | | | | | | | | Add a TARGET_MESSAGES property to control whether Makefile targets print the "Built target " completion messages. Default to ON to preserve existing behavior.
* | | Merge topic 'vs-nsight-tegra-attributes'Brad King2015-07-152-6/+149
|\ \ \ | |_|/ |/| | | | | | | | 8c0afaf4 VS: Add more Nsight Tegra generator Android property settings
| * | VS: Add more Nsight Tegra generator Android property settingsMikhail Filimonov2015-07-142-6/+149
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the Nsight Tegra project generator to add bunch of properties with the backing variables to fine-tune the generated projects. Add target properties that map to all "Configuration" PropertyGroups for each configuration: * ANDROID_ARCH * ANDROID_STL_TYPE Add target properties that map to the AntBuild section of vcxproj files: * ANDROID_ANT_ADDITIONAL_OPTIONS * ANDROID_ASSETS_DIRECTORIES * ANDROID_JAR_DEPENDENCIES * ANDROID_JAR_DIRECTORIES * ANDROID_JAVA_SOURCE_DIR * ANDROID_NATIVE_LIB_DEPENDENCIES * ANDROID_NATIVE_LIB_DIRECTORIES * ANDROID_PROCESS_MAX * ANDROID_PROGUARD * ANDROID_PROGUARD_CONFIG_PATH * ANDROID_SECURE_PROPS_PATH * ANDROID_SKIP_ANT_STEP Reviewed-by: Dmitry Polyanitsa <dpolyanitsa@nvidia.com>
* | 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-146-3/+32
|\ \ | | | | | | | | | | | | | | | 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-136-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>.
* | | 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 topic 'fix-command-rename'Brad King2015-07-131-0/+11
|\ \ \ | | | | | | | | | | | | | | | | d4f032b5 cmState: Restore renamed commands on cleanup.
| * | | cmState: Restore renamed commands on cleanup.Stephen Kelly2015-07-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'fortran-module-preprocessor-defs' into releaseBrad King2015-07-061-1/+1
| |\ \ \
| * | | | CMake 3.3.0-rc3v3.3.0-rc3Brad King2015-06-261-1/+1
| | | | |
| * | | | Merge branch 'fix-target_link_libraries-wrong-dir' into releaseBrad King2015-06-253-4/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'cmake-gui-osx-install-command-line' into releaseBrad King2015-06-242-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-function-missing-end' into releaseBrad King2015-06-226-27/+32
| |\ \ \ \ \ \
| * | | | | | | CMake 3.3.0-rc2v3.3.0-rc2Brad King2015-06-091-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'ctest-script-mode-no-legacy-cygwin' into releaseBrad King2015-06-081-0/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'cmake-gui-osx-install-command-line' into releaseBrad King2015-06-081-0/+1
| |\ \ \ \ \ \ \ \
* | | | | | | | | | 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 '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-101-3/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-3/+13
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'factor-out-common-generator'Brad King2015-07-1019-581/+643
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | cmCommonTargetGenerator: Adopt Convert methodBrad King2015-07-093-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it up from cmMakefileTargetGenerator.