summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindCUDA-aarch64'Brad King2015-11-241-0/+3
|\ | | | | | | | | ae1003cd FindCUDA: Add paths for crosscompiling to aarch64
| * FindCUDA: Add paths for crosscompiling to aarch64Alexander Szakaly2015-11-231-0/+3
| | | | | | | | | | Choose a CUDA_TOOLKIT_TARGET_DIR for the aarch64 architecture automatically.
* | Merge topic 'FindXercesC-imported-targets'Brad King2015-11-246-10/+99
|\ \ | | | | | | | | | | | | 5dcc833b FindXercesC: Add imported targets and unit test
| * | FindXercesC: Add imported targets and unit testRoger Leigh2015-11-236-10/+99
| | |
* | | Merge topic 'doc-CLEAN_NO_CUSTOM-makefile-only'Brad King2015-11-241-4/+3
|\ \ \ | | | | | | | | | | | | | | | | 15c454fe Help: Document CLEAN_NO_CUSTOM as for Makefile generators only (#15856)
| * | | Help: Document CLEAN_NO_CUSTOM as for Makefile generators only (#15856)Brad King2015-11-231-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The property cannot be implemented on other generators because the corresponding native build tools (VS IDE, Xcode, Ninja) all implement their own `clean` operations that affect all outputs. Document this limitation.
* | | | Merge topic 'test-add_subdirectory-in-function'Brad King2015-11-244-0/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 010c5959 Tests: Add case for add_subdirectory inside a function
| * | | | Tests: Add case for add_subdirectory inside a functionBrad King2015-11-234-0/+33
| | | | |
* | | | | Merge topic 'cpack-dmg-multilanguage-sla'Brad King2015-11-241-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0c5b96bf CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable
| * | | | | CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variableSimon Levermann2015-11-231-7/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit f88533cc (CPackDMG: Add support for multilingual SLAs, 2015-10-19) accidentally used CPACK_DMG_LANGUAGES in its implementation instead of the intended CPACK_DMG_SLA_LANGUAGES added to the documentation.
* | | | | Merge topic 'revert-compiler-links-statically'Brad King2015-11-247-23/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9682de56 Revert "Disable shared library support when compiler links statically" (#15855)
| * | | | | Revert "Disable shared library support when compiler links statically" (#15855)Brad King2015-11-237-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~18^2 (Disable shared library support when compiler links statically, 2015-09-30) we tried to detect when the compiler is not capable of linking shared libraries (possibly due to flags in use). However, the approach is not robust against flags like `-nostdlib`. Revert it for now pending another solution to the original problem.
* | | | | | Merge topic 'doc-ios-support'Brad King2015-11-2421-72/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d74c870 Help: Update documentation to reflect support for iOS
| * | | | | | Help: Update documentation to reflect support for iOSBartosz Kosiorek2015-11-2321-72/+102
| | |/ / / / | |/| | | | | | | | | | | | | | | | Many of our interfaces documented for OS X also work for iOS.
* | | | | | CMake Nightly Date StampKitware Robot2015-11-241-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'release'Brad King2015-11-230-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backport-fix-autodef-bigobj-64' into releaseBrad King2015-11-202-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'avoid-divide-by-zero' into releaseBrad King2015-11-191-1/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-forced-toolchain-dialect' into releaseBrad King2015-11-197-0/+29
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'expand_cobertura_search'Brad King2015-11-232-3/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 32268810 CTest: Expand directories for Cobertura search
| * | | | | | | | CTest: Expand directories for Cobertura searchJoseph Snyder2015-11-232-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the Cobertura handler to look for an environment variable called "COBERTURADIR" which contains the directory where the coverage.xml file is found. If that variable doesn't exist, continue to use the default of the binary directory. Update the test to use an appropriate value in the environment variables.
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-231-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-221-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-211-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2015-11-200-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-android-no-versioned-soname' into releaseBrad King2015-11-191-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindGTest-avoid-CMP0064' into releaseBrad King2015-11-181-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'fix-ms-manifest-no-linker' into releaseBrad King2015-11-182-1/+5
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'ninja-symbolic-custom-command'Brad King2015-11-206-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3477b26f Ninja: Always re-run custom commands that have symbolic dependencies 7d64a059 Ninja: Add 'restat' parameter to custom command generation method 866c75de Ninja: Refactor generation of 'restat' on custom commands
| * | | | | | | | | | | | Ninja: Always re-run custom commands that have symbolic dependenciesBrad King2015-11-193-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a custom command has a SYMBOLIC output (that is never actually created) then do not mark the custom command build statement as 'restat'. Otherwise other custom commands that depend on the symbolic output may not always re-run because after running the first custom command Ninja 'restat' will detect that the output timestamp did not change and skip its dependents. This was observed with the ExternalProject BUILD_ALWAYS option where Ninja would not re-run the 'install' step each time 'build' re-runs.
| * | | | | | | | | | | | Ninja: Add 'restat' parameter to custom command generation methodBrad King2015-11-194-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass 'true' from all call sites to preserve existing behavior.
| * | | | | | | | | | | | Ninja: Refactor generation of 'restat' on custom commandsBrad King2015-11-191-1/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move generation of 'restat = 1' from the CUSTOM_COMMAND rule to every build statement using it. This will allow future selection of this option on a per-custom-command basis.
* | | | | | | | | | | | Merge topic 'fix-autodef-bigobj-64'Brad King2015-11-202-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65b86612 Merge branch 'backport-fix-autodef-bigobj-64' into fix-autodef-bigobj-64 c7ddc5f4 Fix auto export symbols for Dlls containing /bigobj for 64bit builds. 75004280 Fix auto export symbols for Dlls containing /bigobj for 64bit builds.
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-fix-autodef-bigobj-64' into fix-autodef-bigobj-64Brad King2015-11-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fix auto export symbols for Dlls containing /bigobj for 64bit builds.Bill Hoffman2015-11-202-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where 64 bit builds with /bigobj incorrectly determined that the object files were not 64 bit. This manifested itself with printf type functions showing up as undefined because the leading underscore was being removed and should not be removed.
| * | | | | | | | | | | | Fix auto export symbols for Dlls containing /bigobj for 64bit builds.Bill Hoffman2015-11-192-1/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where 64 bit builds with /bigobj incorrectly determined that the object files were not 64 bit. This manifested itself with printf type functions showing up as undefined because the leading underscore was being removed and should not be removed.
* | | | | | | | | | | | Merge topic 'avoid-divide-by-zero'Brad King2015-11-201-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5cd92a8 cmELF: Avoid divide by zero if there are no dynamic section entries
| * | | | | | | | | | | cmELF: Avoid divide by zero if there are no dynamic section entriesTy Smith2015-11-191-1/+7
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'restore-android-no-versioned-soname'Brad King2015-11-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdff176f Merge branch 'backport-android-no-versioned-soname' into restore-android-no-versioned-soname 4ba76026 Android: Restore generation of non-versioned soname (#15851) 3aec561a Android: Restore generation of non-versioned soname (#15851)
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-android-no-versioned-soname' into ↵Brad King2015-11-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | restore-android-no-versioned-soname
| | * | | | | | | | | | Android: Restore generation of non-versioned soname (#15851)Brad King2015-11-191-0/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our check of CMAKE_PLATFORM_NO_VERSIONED_SONAME, originally added by commit v3.1.0-rc1~416^2 (Add basic Android platform module, 2014-06-06), was dropped accidentally by commit v3.4.0-rc1~250^2~21 (cmGeneratorTarget: Move GetLibraryNames from cmTarget, 2015-08-04). Restore the check in the new location of the GetLibraryNames method.
| * | | | | | | | | | Android: Restore generation of non-versioned soname (#15851)Brad King2015-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our check of CMAKE_PLATFORM_NO_VERSIONED_SONAME, originally added by commit v3.1.0-rc1~416^2 (Add basic Android platform module, 2014-06-06), was dropped accidentally by commit v3.4.0-rc1~250^2~21 (cmGeneratorTarget: Move GetLibraryNames from cmTarget, 2015-08-04). Restore the check in the new location of the GetLibraryNames method.
* | | | | | | | | | | Merge topic 'fix-forced-toolchain-dialect'Brad King2015-11-207-0/+29
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 441dba80 Project: Guess default standard dialect if compiler was forced (#15852)
| * | | | | | | | | | Project: Guess default standard dialect if compiler was forced (#15852)Brad King2015-11-197-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we always guessed the default language standard dialect based on the compiler version. This was not reliable so that commit switched to computing the default language standard dialect while detecting the compiler id. When a toolchain file uses CMakeForceCompiler to set the compiler id then the detection does not occur. Therefore commit v3.4.0-rc1~54^2 (Project: Don't require computed default dialect if compiler was forced, 2015-09-22) made the lack of detection an error only if the compiler was not forced. However, this means that projects using CMakeForceCompiler no longer even get the guess that we had before so <LANG>_COMPILER does not work. Due to the sophistication of CMake's compiler detection logic projects should be ported away from using CMakeForceCompiler. In the meantime, restore a guess of the default language standard dialect when the compiler is forced.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2015-11-201-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'add-cray-linux-platform'Brad King2015-11-191-66/+88
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 743fcf1e Cray: Fix static / dynamic detection logic and parse more driver flags
| * | | | | | | | | | Cray: Fix static / dynamic detection logic and parse more driver flagsChuck Atkins2015-11-181-66/+88
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'FindGTest-avoid-CMP0064'Brad King2015-11-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5e7b22d FindGTest: Refactor test type checks to avoid cases triggering CMP0064
| * | | | | | | | | | FindGTest: Refactor test type checks to avoid cases triggering CMP0064Brad King2015-11-181-3/+3
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our if() conditions to avoid CMP0064 warnings when `${test_type}` is equal to `TEST`. Reported-by: David T. Chen <dchen@mail.nih.gov>
* | | | | | | | | | Merge topic 'fix-ms-manifest-no-linker'Brad King2015-11-192-1/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | ca263d1d MSVC: Fix linking with /MANIFEST:NO option