summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Fix test architecture selection for Xcode >= 5Brad King2013-10-022-4/+4
| | | | | | | | In Tests/Architecture and Tests/BuildDepends/Project we select a set of OS X cpu architectures to use for the test. Prior to Xcode 4 we always used i386 and ppc. Starting with Xcode 4, the tools do not support ppc but do support x86_64, so we switch to that. Fix the version check to recognize Xcode >= 5 as at least Xcode 4 and use the new architectures.
* CMake Nightly Date StampKitware Robot2013-10-021-1/+1
|
* Merge topic 'osx-find-sdk-frameworks'Brad King2013-10-011-0/+9
|\ | | | | | | | | 1fce189 OS X: Search system SDKs for frameworks
| * OS X: Search system SDKs for frameworksBrad King2013-09-271-0/+9
| | | | | | | | | | | | | | | | In Modules/Platform/Darwin.cmake set CMAKE_SYSTEM_FRAMEWORK_PATH to include framework directories from inside the system SDK corresponding to CMAKE_OSX_SYSROOT. Suggested-by: Sean McBride <sean@rogue-research.com>
* | 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
| |
* | Merge topic 'wince-archfam'Brad King2013-09-261-4/+11
|\ \ | | | | | | | | | | | | 0b15ffc MSVC: Fix WinCE arch family preprocessor symbol (#14436)
| * | MSVC: Fix WinCE arch family preprocessor symbol (#14436)Patrick Gansterer2013-09-251-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit bd827f98 (Use COFF file header header for architecture detection, 2013-08-05) the MSVC_<lang>_ARCHITECTURE_ID value computed by CMakeDetermineCompilerId.cmake changed for WinCE architectures to be the exact architecture read from the PE header. Fix platform preprocessor definitions in Modules/Platform/Windows-MSVC.cmake to correspond to the architecture family (ARM or SHx) instead of the specific architecture.
* | | Merge topic 'wince-subsystem'Brad King2013-09-261-1/+5
|\ \ \ | | | | | | | | | | | | | | | | 8bb3b3d VS: Use version-specific subsystem for WinCE compiler id (#14440)
| * | | VS: Use version-specific subsystem for WinCE compiler id (#14440)Patrick Gansterer2013-09-251-1/+5
| |/ / | | | | | | | | | | | | | | | The subsystem must be set to WINDWOSCE for some SDKs to link an executable. Set it to 9 for VS2005 and to 8 for VS2008, since the value differs between the different Visual Studio versions.
* | | CMake Nightly Date StampKitware Robot2013-09-261-1/+1
| | |
* | | Merge topic 'bash-completion-future-filter'Brad King2013-09-253-8/+8
|\ \ \ | | | | | | | | | | | | | | | | a8d7141 bash-completion: Future-proof --help-*-list "cXXXX version" filtering
| * | | bash-completion: Future-proof --help-*-list "cXXXX version" filteringBrad King2013-09-253-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A future version of CMake may not print the "cmake version" line at the beginning of the --help-*-list output. Filter out the line with 'grep' instead of 'tail' to tolerate output from versions of CMake with and without the version line. Match "cmake version", "cpack version", and "ctest version" in each corresponding completion script.
* | | | Merge topic 'hppa-bootstrap'Brad King2013-09-251-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ca63bb1 bootstrap: try better workaround for builds on Linux/HPPA
| * | | | bootstrap: try better workaround for builds on Linux/HPPARolf Eike Beer2013-09-121-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workaround currently present works fine without -O or with -O1, but fails with -Os or -O2 and higher. Using -O2 is common e.g. in Gentoo, as resulting in bugs like this: https://bugs.gentoo.org/473276 Prevent the workaround for higher optimization levels to make bootstrapping more likely to succeed. This is still a workaround as ld still keeps crashing in some situations.
* | | | CMake Nightly Date StampKitware Robot2013-09-251-1/+1
| |/ / |/| |
* | | Merge topic 'wince-corelibc'Brad King2013-09-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | e63cf5f MSVC: Fix version test for linking corelibc on Windows CE (#14420)
| * | | MSVC: Fix version test for linking corelibc on Windows CE (#14420)Patrick Gansterer2013-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In commit 8fcf0ab0 (Add support for new Windows CE compiler, 2013-08-04) we made corelibc conditional on the MSVC version, but the version value was incorrect. Update it to use corelibc for VS 2008 and below.
* | | | 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
| | |
* | | Merge topic 'FindHDF5-fix-lib-selection'Brad King2013-09-201-36/+2
|\ \ \ | | | | | | | | | | | | | | | | 0f05961 FindHDF5: Fix regression in per-configuration library selection
| * | | FindHDF5: Fix regression in per-configuration library selectionBrad King2013-09-191-36/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When FindHDF5 was first added in commit e6734068 (Add HDF5 find module..., 2009-08-24) it contained a workaround for a bug in SelectLibraryConfigurations that did not transform lists correctly. That bug was fixed by commit 5797512c (SelectLibraryConfiguration: generate correct output when input vars are lists, 2012-07-28). Then refactoring in commit 04d4dc33 (SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars, 2013-07-08) changed undocumented behavior on which the original workaround relied. The result puts entries like HDF5_hdf5_LIBRARY_DEBUG-NOTFOUND in HDF5_LIBRARIES. Fix this by dropping the original workaround since the underlying issue has been fixed anyway. Use the HDF5_${LIB}_LIBRARY selected by the call to select_library_configurations directly.
* | | | 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
| | |
* | | Merge topic 'FindPNG-compatibility'Brad King2013-09-171-5/+9
|\ \ \ | | | | | | | | | | | | | | | | 6816044 FindPNG: Honor old PNG_LIBRARY if provided (#14398)
| * | | FindPNG: Honor old PNG_LIBRARY if provided (#14398)Brad King2013-09-131-5/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 2a797539 (FindPNG: improve library detection, 2013-07-27) we split the search for PNG into separate PNG_LIBRARY_DEBUG and PNG_LIBRARY_RELEASE variables. However, if a project or user sets the old PNG_LIBRARY value we must honor it instead of searching. While at it, mark PNG_LIBRARY_RELEASE and PNG_LIBRARY_DEBUG as advanced and remove a stray debug message.
* | | CMake Nightly Date StampKitware Robot2013-09-171-1/+1
| | |
* | | Merge topic 'FindCUDA-list-obj-files'Brad King2013-09-161-16/+1
|\ \ \ | | | | | | | | | | | | | | | | ef27fa6 FindCUDA: Always list custom command outputs in their targets
| * | | FindCUDA: Always list custom command outputs in their targetsBrad King2013-09-131-16/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | CMake's intended interface for linking to explicit object files (marked with EXTERNAL_OBJECT) is that only those listed as target sources should be linked. Drop FindCUDA's attempt to hide the .obj files from VS IDE project files, which depends on VS-version-specific behavior of linking custom command outputs that happen to be named "*.obj". CMake puts external object files in a dedicated source group anyway.
* | | 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-123-1/+25
|\ \ \ | |/ / | | | | | | | | | 81d2793 Add differing target property content to policy CMP0022 warning
| * | Add differing target property content to policy CMP0022 warningStephen Kelly2013-09-113-1/+25
| | | | | | | | | | | | | | | List the contents of the INTERFACE_LINK_LIBRARIES and the old-style property.
* | | Merge topic 'ninja-MSVC-link-executables'Brad King2013-09-121-1/+0
|\ \ \ | | | | | | | | | | | | | | | | 3cd753d MSVC: Drop /link from executable link lines with Ninja
| * | | MSVC: Drop /link from executable link lines with NinjaBrad King2013-09-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fb9f73de (MSVC: Invoke 'link' directly for executables, 2013-04-08) we forgot to remove the /link option handling added by commit e31df039 (Ninja: move <OBJECTS> in front of the first linker option, 2012-09-27) to the Platform/Windows-MSVC module. Drop it now.
* | | | Merge topic 'vs-intel-version'Brad King2013-09-121-7/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cd90a0e VS: Future-proof Intel project format selection
generated by cgit v0.12 at 2025-01-30 16:08:20 (GMT)