summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'output-CMP0022-entries' into policy-CMP0022-fixesBrad King2013-11-021-1/+26
|\
| * CMP0022: Output link interface mismatch for static library warningStephen Kelly2013-10-231-1/+26
| | | | | | | | | | | | Other warnings for the same policy already have similar output since commit 81d2793e (Add differing target property content to policy CMP0022 warning, 2013-09-11).
* | Don't add invalid content to static lib INTERFACE_LINK_LIBRARIES.Stephen Kelly2013-10-262-8/+18
|/ | | | | | | | | | | | | Only valid target names or generator expressions may appear in the target field of a LINK_ONLY expression. Other content like link flags should still be added to that property (wrapped in config-specific generator expressions), but not wrapped in LINK_ONLY. Otherwise undue warnings would be issued for the policy CMP0022. The LINK_ONLY expression only has an effect for actual target names anyway, so there is no logical deficit.
* Merge topic 'fix-install-include-dirs-processing'Brad King2013-10-071-0/+3
|\ | | | | | | | | 6f98f4a Genex: Fix processing multiple include directories for relative paths
| * Genex: Fix processing multiple include directories for relative pathsStephen Kelly2013-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | CMake Nightly Date StampKitware Robot2013-10-071-1/+1
|/
* CMake Nightly Date StampKitware Robot2013-10-061-1/+1
|
* CMake Nightly Date StampKitware Robot2013-10-051-1/+1
|
* CMake Nightly Date StampKitware Robot2013-10-041-1/+1
|
* Merge topic 'xcode-5'Brad King2013-10-031-30/+58
|\ | | | | | | | | | | | | | | a3194ff Xcode: Fix OBJECT library support for Xcode 5 (#14254) dff8d11 Xcode: Drop XCODE_DEPEND_HELPER for Xcode >= 5 1180322 Xcode: Teach Tests/BuildDepends to allow LINK_DEPENDS_NO_SHARED failure 765b46d Xcode: Fix test architecture selection for Xcode >= 5
| * Xcode: Fix OBJECT library support for Xcode 5 (#14254)Brad King2013-10-021-19/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 2.1 through 4 supported $(CURRENT_ARCH) in a PBXFileReference 'path' value used in the "Link Binary with Libraries" build phase. CMake uses this to reference object file locations on link lines to bring in OBJECT library content. However, Xcode 5 now evaluates the $(CURRENT_ARCH) reference in this context as "undefined_arch" so the wrong path is given to the linker. There seems to be no alternative way to produce an architecture-specific value in a PBXFileReference. Fortunately Xcode 5 now also handles link dependencies for paths linked through OTHER_LDFLAGS. For Xcode >= 5, move the OBJECT library object file references from the link build phase to OTHER_LDFLAGS. We can still show the object files in the source group listing in either case.
| * Xcode: Drop XCODE_DEPEND_HELPER for Xcode >= 5Brad King2013-10-021-12/+19
| | | | | | | | | | | | Xcode 5.0 now computes dependencies from files linked through OTHER_LDFLAGS, so we no longer need the XCODE_DEPEND_HELPER hack to re-link dependents when targets change.
* | CMake Nightly Date StampKitware Robot2013-10-031-1/+1
|/
* CMake Nightly Date StampKitware Robot2013-10-021-1/+1
|
* Merge topic 'fix-duplicate-custom-commands'Brad King2013-10-011-0/+13
|\ | | | | | | | | dccd494 Use first custom command for the same output (#14446)
| * Use first custom command for the same output (#14446)Brad King2013-09-301-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In buggy code like add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/out.h MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/out.h.in ...) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/out.h ...) that has more than one rule to generate the same output CMake has always used the first rule. However, since commit 2268c41a (Optimize custom command full-path dependency lookup, 2013-08-06) we update the map from output to cmSourceFile for every rule generating an output, effectively keeping the last command instead of the first. Fix this regression by checking for each map update if the output already has an entry. If so, keep only the original entry. The VS 8 generator triggers this with a special case for generate.stamp rules that differ between ZERO_CHECK and normal targets, so do not warn for now. Leave a TODO comment for warning in the future.
* | CMake Nightly Date StampKitware Robot2013-10-011-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-301-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-261-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-251-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-241-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-231-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-221-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-211-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-201-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-191-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-181-1/+1
| |
* | CMake Nightly Date StampKitware Robot2013-09-171-1/+1
| |
* | Merge topic 'fix-genex-preprocessing-incomplete'Brad King2013-09-161-4/+12
|\ \ | | | | | | | | | | | | 70089d0 genex: Fix preprocessing with incomplete content (#14410).
| * | genex: Fix preprocessing with incomplete content (#14410).Stephen Kelly2013-09-131-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | Similar incomplete generator expressions are already tested in the GeneratorExpression unit test, but those are executed with add_custom_target. The generator expressions in the include directories are run through the preprocessor, whereas the ones run through add_custom_target are not.
* | | CMake Nightly Date StampKitware Robot2013-09-161-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-09-151-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-09-141-1/+1
| | |
* | | Merge topic 'print-CMP0022-content-conflict'Brad King2013-09-131-1/+1
|\ \ \ | |/ / |/| | | | | | | | 271bf10 Fix CMP0022 warning when no old-style property is set
| * | Fix CMP0022 warning when no old-style property is setStephen Kelly2013-09-131-1/+1
| | | | | | | | | | | | The string could be null at this point.
* | | CMake Nightly Date StampKitware Robot2013-09-131-1/+1
| | |
* | | Merge topic 'print-CMP0022-content-conflict'Brad King2013-09-121-1/+7
|\ \ \ | |/ / | | | | | | | | | 81d2793 Add differing target property content to policy CMP0022 warning
| * | Add differing target property content to policy CMP0022 warningStephen Kelly2013-09-111-1/+7
| | | | | | | | | | | | | | | List the contents of the INTERFACE_LINK_LIBRARIES and the old-style property.
* | | Merge topic 'vs-intel-version'Brad King2013-09-121-7/+11
|\ \ \ | | | | | | | | | | | | | | | | cd90a0e VS: Future-proof Intel project format selection
| * | | VS: Future-proof Intel project format selectionBrad King2013-09-101-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version of Intel Fortran that actually uses 9.10 as a project format is very old. Default to the latest format version (11.0) and use the older format only when known to be necessary. Suggested-by: Dick Munroe <munroe@csworks.com>
* | | | CMake Nightly Date StampKitware Robot2013-09-121-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2013-09-111-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2013-09-101-1/+1
| |
* | Merge topic 'no_track_configured_files'Brad King2013-09-091-9/+19
|\ \ | | | | | | | | | | | | 38571f2 cmMakefile: Do not track CMake temporary files.
| * | cmMakefile: Do not track CMake temporary files.Robert Maynard2013-09-091-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ad502502 (cmMakefile: Track configured files so we can regenerate them, 2013-06-18) cmMakefile::ConfigureFile records the configured file as an output file generated by CMake. The intention is that for make and ninja we can re-run CMake when one of the files it generates goes missing. However, files configured temporarily in CMakeTmp directories by Check* modules do not live past the CMake invocation. We have to also track input files to the configure command. In theory the input to a configure command could it self be a file that is going to be deleted later (output from a custom command or configure_file).
* | | CMake Nightly Date StampKitware Robot2013-09-091-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-09-081-1/+1
| | |