summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| * | | | | MSVC: Fix linking with /MANIFEST:NO optionBrad King2015-11-182-1/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.4.0-rc1~74^2~1 (MSVC: Rewrite manifest file handling with Makefile and Ninja, 2015-09-15) broke handling of this option. Fix it and add a test case.
* | | | | CMake Nightly Date StampKitware Robot2015-11-191-1/+1
| | | | |
* | | | | Merge topic 'unique_def_symbols'Brad King2015-11-183-23/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1c1ace2d De-duplicate symbols listed in generated module definition files
| * | | | | De-duplicate symbols listed in generated module definition filesBill Hoffman2015-11-183-23/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MS tools have a limit on the number of symbols that can be listed in a `.def` file. If multiple `.obj` files provide a symbol then avoid listing it more than once in the generated `.def` file to avoid counting toward the limit.
* | | | | | Merge branch 'release'Brad King2015-11-180-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'fix-compute-default-dialect-lto' into releaseBrad King2015-11-182-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cray-fortran-version' into releaseBrad King2015-11-121-0/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'cmake-gui-select-toolset'Brad King2015-11-1821-26/+203
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b958a20 cmake-gui: Add option to specify generator toolset
| * | | | | | | cmake-gui: Add option to specify generator toolsetRobert Dailey2015-11-1721-26/+203
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -T parameter to CMake may now be specified through cmake-gui via a new text field in the first-time configure wizard (below the generator chooser). The generator factories specify whether or not they support toolsets. This information is propagated to the Qt code and used to determine if the selected generator should also display the optional Toolset widgets.
* | | | | | | Merge topic 'fix-compute-default-dialect-lto'Brad King2015-11-182-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | c3dc8935 Make C and C++ default dialect detection robust to advanced optimizations
| * | | | | | Make C and C++ default dialect detection robust to advanced optimizationsBrad King2015-11-182-0/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we added an "INFO:..." string to the compiler id detection binary. The value can be optimized out of the compiler id binary unless we force it to be included by making the program behavior depend on it at runtime. Add references to the value as we do for the other info strings already. Gentoo-Issue: https://bugs.gentoo.org/show_bug.cgi?id=565744
* | | | | | Merge topic 'oracle-implicit-link-dirs'Brad King2015-11-181-6/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6772913f SunOS: Remove obsolete Studio compiler library directories
| * | | | | | SunOS: Remove obsolete Studio compiler library directoriesApril Chin2015-11-161-6/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES setting is no longer needed because CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES is now populated with the actual implicit link directories for the current toolchain. The old values we hard-coded in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES are not relevant to modern toolchains, so simply drop them. Co-Author: Shawn Walker-Salas <shawn.walker@oracle.com>
* | | | | | CMake Nightly Date StampKitware Robot2015-11-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-11-171-1/+1
|/ / / / /
* | | | | Merge topic 'non-xcode-framework-layout'Brad King2015-11-1610-3/+143
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6f03ed4 Add test for OSX/iOS Framework directory structure (#15833) 9f053763 Fix iOS Framework directory structure (#15833)
| * | | | | Add test for OSX/iOS Framework directory structure (#15833)Gregor Jasny2015-11-139-0/+131
| | | | | |
| * | | | | Fix iOS Framework directory structure (#15833)Bartosz Kosiorek2015-11-131-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | Merge topic 'add-cray-linux-platform'Brad King2015-11-164-0/+276
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 31d52139 Cray: Added documentation for cross compiling on a Cray c54a621b Cray: New platform file for Cray Linux Environment and PrgEnv
| * | | | | Cray: Added documentation for cross compiling on a CrayChuck Atkins2015-11-142-0/+37
| | | | | |