summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update_trilinos_contract_test'Brad King2013-10-076-9/+9
|\ | | | | | | | | 5a4a584 update Trilinos contract test
| * update Trilinos contract testZack Galbreath2013-08-286-9/+9
| | | | | | | | | | | | | | The old version encountered a compile error on newer versions of GCC. Update to the latest supported release of Trilinos, remove the version number from the name of the Contract, and some other minor tweaks to get the test passing once more.
* | Merge topic 'fix-style'Brad King2013-10-071-32/+32
|\ \ | | | | | | | | | | | | 5916645 Fix some indentation problems in cmPolicies.
| * | Fix some indentation problems in cmPolicies.Stephen Kelly2013-08-281-32/+32
| |/
* | Merge topic 'MAP_IMPORTED_CONFIG-property-default'Brad King2013-10-072-1/+13
|\ \ | | | | | | | | | | | | fb1294c cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>
| * | cmTarget: Add initializer for MAP_IMPORTED_CONFIG_<CONFIG>Stephen Kelly2013-08-282-1/+13
| |/
* | Merge topic 'vs-no-regen-external-msproject'Brad King2013-10-072-11/+14
|\ \ | | | | | | | | | | | | e478f03 VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)
| * | VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378)Brad King2013-08-282-11/+14
| | | | | | | | | | | | | | | | | | | | | When CMAKE_SUPPRESS_REGENERATION tells us not to create the ZERO_CHECK target we should not add dependencies on it from other targets either. Reviewed-by: Mateusz Loskot <mateusz@loskot.net>
* | | Merge topic 'PLATFORM_ID-genex'Brad King2013-10-074-0/+51
|\ \ \ | | | | | | | | | | | | | | | | dcc00ec Genex: Add the PLATFORM_ID expression.
| * | | Genex: Add the PLATFORM_ID expression.Stephen Kelly2013-08-284-0/+51
| | | |
* | | | Merge topic 'automoc-gadget'Brad King2013-10-074-15/+55
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d4937da Search for the Q_GADGET macro for running automoc too.
| * | | | Search for the Q_GADGET macro for running automoc too.Stephen Kelly2013-08-284-15/+55
| | |/ / | |/| |
* | | | Merge topic 'ADDITIONAL_MAKE_CLEAN_FILES-genex'Brad King2013-10-072-1/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d26594f Genex: Evaluate genexes for additional make clean files.
| * | | | Genex: Evaluate genexes for additional make clean files.Stephen Kelly2013-08-272-1/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary because custom commands and targets may create custom files whose names are determined by generator expressions. For example, clang should be using $<TARGET_FILE> and $<TARGET_FILE_DIR> instead of reverse engineering the output file name: http://thread.gmane.org/gmane.comp.compilers.clang.scm/80523 However, that can only be done when ADDITIONAL_MAKE_CLEAN_FILES also accepts and evaluates generator expressions. Similarly, KDE uses the LOCATION property where $<TARGET_FILE> would also be better in KDE4_HANDLE_RPATH_FOR_EXECUTABLE but also appends the result to ADDITIONAL_MAKE_CLEAN_FILES. After this patch, both can be ported to generator expressions.
* | | | Merge topic 'fix-reset-compiler'Brad King2013-10-071-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8b2a2db Fix resetting the compiler on the command line (#14366).
| * | | | Fix resetting the compiler on the command line (#14366).Stephen Kelly2013-08-191-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the incoming value to a path in the same way that the already-cached value was converted before comparison. Do the actual comparison only one time, after both values are normalized.
* | | | | Merge topic 'FortranCInterface-cross-compile'Brad King2013-10-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d7a65a2 FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)
| * | | | | FortranCInterface: Fix cross-compiling Linux to MinGW (#14358)Michel Zou2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After building the test binary tell find_program to search for it with the ${CMAKE_EXECUTABLE_SUFFIX} so that the .exe can be found. Since find_program is normally used to locate host tools while cross-compiling it needs this hint to find the target binary. Suggested-by: Denis Barbier <bouzim@gmail.com>
* | | | | | Merge topic 'remove-local-typedef'Brad King2013-10-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a7fecc remove unused local typedef
| * | | | | | remove unused local typedefRolf Eike Beer2013-08-141-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes this warning from g++ 4.8: CMake/Source/cmDocumentation.cxx:835:23: warning: typedef 'sdoc_t' locally defined but not used [-Wunused-local-typedefs] SDOC_UNKNOWN} sdoc_t; ^
* | | | | | Merge topic 'no-duplicate-find-tests'Brad King2013-10-071-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796c618 blacklist tests with their own test in Tests/Module from AllFindModules test
| * | | | | | blacklist tests with their own test in Tests/Module from AllFindModules testRolf Eike Beer2013-08-091-2/+9
| | | | | | |
* | | | | | | Begin post-2.8.12 developmentBrad King2013-10-071-2/+2
| | | | | | |
* | | | | | | CMake 2.8.12v2.8.12Brad King2013-10-072-1/+12
| | | | | | |
* | | | | | | Merge branch 'release'Brad King2013-10-073-4/+568
|\ \ \ \ \ \ \
| * | | | | | | CMake 2.8.12-rc4Brad King2013-10-012-1/+26
| | | | | | | |
| * | | | | | | Merge branch 'release'Brad King2013-10-013-4/+543
| |\ \ \ \ \ \ \
| | * | | | | | | CMake 2.8.12-rc3Robert Maynard2013-09-092-1/+6
| | | | | | | | |
| | * | | | | | | Merge branch 'release'Robert Maynard2013-09-093-4/+538
| | |\ \ \ \ \ \ \
| | | * | | | | | | CMake 2.8.12-rc2Robert Maynard2013-08-302-1/+37
| | | | | | | | | |
| | | * | | | | | | Merge branch 'release'Robert Maynard2013-08-303-4/+502
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | CMake 2.8.12-rc1Brad King2013-08-153-4/+502
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'fix-install-include-dirs-processing'Brad King2013-10-072-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f98f4a Genex: Fix processing multiple include directories for relative paths
| * | | | | | | | | | | Genex: Fix processing multiple include directories for relative pathsStephen Kelly2013-10-072-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-034-34/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | Xcode: Teach Tests/BuildDepends to allow LINK_DEPENDS_NO_SHARED failureBrad King2013-10-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 5.0 now relinks targets when their shared libraries dependencies are modified, and there seems to be no way to stop it. Report this as a known limitation in the test output and do not fail.
| * | | | | | | | | | | 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-031-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | 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
| | | | | | | | | | | |