summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'enable-language-require-compiler'Brad King2013-10-2835-39/+233
|\ | | | | | | | | | | | | 3e04946 Require CMAKE_<LANG>_COMPILER to be found as a full path 6007f7c CMakeDetermineCompilerId: Always use compiler detected from IDE 332771c CMakeDetermine*Compiler: Remove temporary cache entry
| * Require CMAKE_<LANG>_COMPILER to be found as a full pathBrad King2013-10-2830-29/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All generators now support detection of the full path to the compiler, so require it to be so. This will allow CMake<LANG>Information.cmake and other logic to assume the full path to the compiler tool is available. The Makefile generators already rejected CMAKE_<LANG>_COMPILER values that did not name an existing compiler. Extend this error message to all generators, make it occur as early as possible, and improve the message with advice about how to set the compiler. If the full path to the compiler is not known, finish enabling languages with a fatal error so configuration does not continue. For now, allow the RC language compiler to not be a full path. Later we will need to detect the full path to "rc" under the VS IDE. Add a RunCMake.CompilerNotFound test to cover failure cases. Fix the RunCMake.CompilerChange test EmptyCompiler case to work when configuration does not continue past enable_language.
| * CMakeDetermineCompilerId: Always use compiler detected from IDEBrad King2013-10-281-6/+4
| | | | | | | | | | | | | | When compiler id detection also provides a CMAKE_<LANG>_COMPILER value, use it unconditionally. It is known to be the compiler that is actually in use by IDE builds in VS and Xcode. Do not let a stray cache entry try to say otherwise.
| * CMakeDetermine*Compiler: Remove temporary cache entryBrad King2013-10-244-4/+4
| | | | | | | | | | | | | | | | When the user or toolchain file sets CMAKE_<LANG>_COMPILER to a name without a path we use find_program with CMAKE_<LANG>_COMPILER_WITH_PATH to search for the tool. Remove the temporary cache entry afterward to avoid exposing it to projects. It is not set by other logic paths so no one should be using it.
* | Merge topic 'restore-serial-failed-test-order'Brad King2013-10-281-3/+4
|\ \ | | | | | | | | | | | | 2b5c9da CTest: restore old failed test priority in serial test runs
| * | CTest: restore old failed test priority in serial test runsNils Gladitz2013-10-271-3/+4
| | |
* | | Merge topic 'locale-independent-date-in-test'Brad King2013-10-281-132/+31
|\ \ \ | | | | | | | | | | | | | | | | 0655d09 Tests: use string(TIMESTAMP) instead of system and locale specific date/time
| * | | Tests: use string(TIMESTAMP) instead of system and locale specific date/timeNils Gladitz2013-10-261-132/+31
| | | |
* | | | Merge topic 'ninja-use-deps'Brad King2013-10-2811-77/+158
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | eeb4aec Ninja: use deps = gcc/msvc feature
| * | | | Ninja: use deps = gcc/msvc featurePeter Kümmel2013-10-2411-77/+158
| | | | | | | | | | | | | | | | | | | | cmcldeps is now only used for .rc file processing
* | | | | CMake Nightly Date StampKitware Robot2013-10-281-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2013-10-271-1/+1
| |/ / |/| |
* | | Merge topic 'ctest-fix-run-serial'Brad King2013-10-265-59/+127
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff59365 CTest: fix dashboard issues associated with the ctest-fix-run-serial topic 7a665ae CTest: added test for RUN_SERIAL issue #14484 384beff CTest: added comments that describe the basic test sorting approach adbe00d CTest: removed redundant copy of test dependency set 1b750cb CTest: perform cycle test early 6d4d7ca CTest: consider previously failed tests before all others e809d8c CTest: prioritize tests by their depth in the dependency graph 44017a4 CTest: handle dependent and non dependent test requirements equally
| * | | CTest: fix dashboard issues associated with the ctest-fix-run-serial topicNils Gladitz2013-10-253-8/+24
| | | |
| * | | CTest: added test for RUN_SERIAL issue #14484Nils Gladitz2013-10-213-0/+39
| | | |
| * | | CTest: added comments that describe the basic test sorting approachNils Gladitz2013-10-211-0/+7
| | | |
| * | | CTest: removed redundant copy of test dependency setNils Gladitz2013-10-211-7/+1
| | | |
| * | | CTest: perform cycle test earlyNils Gladitz2013-10-192-1/+8
| | | |
| * | | CTest: consider previously failed tests before all othersNils Gladitz2013-10-191-15/+10
| | | |
| * | | CTest: prioritize tests by their depth in the dependency graphNils Gladitz2013-10-181-4/+45
| | | |
| * | | CTest: handle dependent and non dependent test requirements equallyNils Gladitz2013-10-171-40/+9
| | | |
* | | | Merge topic 'ctest-p4'Brad King2013-10-2611-2/+969
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 970c823 ctest_update: Add support for Perforce p4 client
| * | | | ctest_update: Add support for Perforce p4 clientPedro Navarro2013-10-2611-2/+969
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the ctest_update implementation to use the p4 command-line client to perform updates and extract the list of changes. Add a CTest.UpdateP4 test like those that exist already for the other version control tools. Make the test available when p4 and the p4d server are found. During the test launch p4d in the background to serve a repository from the test directory. Then direct the client toward this server for the duration of the test.
* | | | | Merge topic 'less-versioned-installs'Brad King2013-10-262-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1093dee Shorten CMake version used in install destinations
| * | | | | Shorten CMake version used in install destinationsBrad King2013-10-252-4/+12
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c9a5f34b (Cleanup use of CMake version in install destinations, 2013-09-26) we use the full CMake version in default install destinations. For rapidly changing versions of the form <major>.<minor>.<patch>.<date>-g<commit>[-dirty] used by developers this is too granular. Instead use just <major>.<minor>.<patch> as the version for default install destinations. This will still be granular enough for unique directories in releases. On Cygwin continue to use the full ${CMake_VERSION} as was the case prior to the above-mentioned commit.
* | | | | Merge topic 'clang-binutils'Brad King2013-10-262-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b84f5c2 Find appropriate binutils when cross-compiling with clang
| * | | | | Find appropriate binutils when cross-compiling with clangStephen Kelly2013-10-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One way to use clang as a cross-compiler is to create a symlink named <target>-clang, which is equivalent to running clang -target <target> Extract the toolchain prefix to find the binutils executables.
* | | | | | Merge topic 'QNX-ninja-generator'Brad King2013-10-261-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02cf77f QNX: Don't attempt to create depfiles
| * | | | | | QNX: Don't attempt to create depfilesStephen Kelly2013-10-251-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The qcc driver can not handle the flags. This makes it possible to use qcc with the Ninja generator.
* | | | | | Merge topic 'handle-CMP0024-in-tests'Brad King2013-10-269-46/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 310aef9 Make ExportLanguages a subtest of the ObjectLibrary test 30ff6cf Refactor the Plugin test.
| * | | | | | Make ExportLanguages a subtest of the ObjectLibrary testStephen Kelly2013-10-247-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a subtest of the RunCMake.ObjectLibrary test. However, we need to test a build with ExternalProject after running CMake, which RunCMake tests do not do.
| * | | | | | Refactor the Plugin test.Stephen Kelly2013-10-242-30/+42
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy CMP0024 was introduced to disallow the include() of a file generated by export(). Use ExternalProject to test the plugins after building.
* | | | | | Merge topic 'wix-fix-shortcut-ids'Brad King2013-10-266-129/+210
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe7f8c9 CPackWiX: use safe IDs for generated start menu shortcuts
| * | | | | | CPackWiX: use safe IDs for generated start menu shortcutsNils Gladitz2013-10-266-129/+210
| | | | | | |
* | | | | | | Merge topic 'python-interp-remove-debug-messages'Brad King2013-10-261-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49c4699 python: remove debug statements from FindPythonInterp.cmake.
| * | | | | | | python: remove debug statements from FindPythonInterp.cmake.Clinton Stimpson2013-10-241-2/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge topic 'intel-no-i_dynamic'Brad King2013-10-261-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f61bcbc Intel: Drop deprecated -i_dynamic flag from Fortran (#14507)
| * | | | | | | Intel: Drop deprecated -i_dynamic flag from Fortran (#14507)Brad King2013-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -i_dynamic flag is deprecated and not even listed in the manual for Intel Composer XE 2013. Reported-by: Izaak Beekman <zbeekman@gmail.com>
* | | | | | | | Merge topic 'compatible-interface-numbers'Brad King2013-10-2611-36/+429
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff6c401 cmTarget: Add interface for compatible numeric properties e4e20c1 cmTarget: Add enumeration for consistency to expect from properties. 9877769 cmTarget: Assign consistent content back to the property being evaluated. 816b4a8 cmTarget: Make consistentProperty return consistent content. 030800a cmTarget: Add a template to create correct implied content.
| * | | | | | | | cmTarget: Add interface for compatible numeric propertiesStephen Kelly2013-10-2411-16/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the boost MPL library, one can set a define to increase the limit of how many variadic elements should be supported. The default for BOOST_MPL_LIMIT_VECTOR_SIZE is 20: http://www.boost.org/doc/libs/1_36_0/libs/mpl/doc/refmanual/limit-vector-size.html If the foo library requires that to be set to 30, and the independent bar library requires it to be set to 40, consumers of both need to set it to 40. add_library(foo INTERFACE) set_property(TARGET foo PROPERTY INTERFACE_boost_mpl_vector_size 30) set_property(TARGET foo PROPERTY COMPATIBLE_INTERFACE_NUMBER_MAX boost_mpl_vector_size) target_compile_definitions(foo INTERFACE BOOST_MPL_LIMIT_VECTOR_SIZE=$<TARGET_PROPERTY:boost_mpl_vector_size>) add_library(bar INTERFACE) set_property(TARGET bar PROPERTY INTERFACE_boost_mpl_vector_size 40) # Technically the next two lines are redundant, but as foo and bar are # independent, they both set these interfaces. set_property(TARGET bar PROPERTY COMPATIBLE_INTERFACE_NUMBER_MAX boost_mpl_vector_size) target_compile_definitions(bar INTERFACE BOOST_MPL_LIMIT_VECTOR_SIZE=$<TARGET_PROPERTY:boost_mpl_vector_size>) add_executable(user) target_link_libraries(user foo bar) Because the TARGET_PROPERTY reads the boost_mpl_vector_size property from the HEAD of the dependency graph (the user target), and because that property appears in the COMPATIBLE_INTERFACE_NUMBER_MAX of the dependencies of the user target, the maximum value for it is chosen for the compile definition, ie, 40. There are also use-cases for choosing the minimum value of a number. In Qt, deprecated API can be disabled by version. Setting the definition QT_DISABLE_DEPRECATED_BEFORE=0 disables no deprecated API. Setting it to 0x501000 disables API which was deprecated before Qt 5.1 etc. If two dependencies require the use of API which was deprecated in different Qt versions, then COMPATIBLE_INTERFACE_NUMBER_MIN can be used to ensure that both can compile.
| * | | | | | | | cmTarget: Add enumeration for consistency to expect from properties.Stephen Kelly2013-10-241-18/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of consistency to be expected will be extended to cover numeric minimum and maximum.
| * | | | | | | | cmTarget: Assign consistent content back to the property being evaluated.Stephen Kelly2013-10-241-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, 'consistent' means the same or not set. Soon though, it will be possible to choose a minimum number from an interface for example.
| * | | | | | | | cmTarget: Make consistentProperty return consistent content.Stephen Kelly2013-10-241-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upcoming features will make use of that.
| * | | | | | | | cmTarget: Add a template to create correct implied content.Stephen Kelly2013-10-241-0/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, in the string case, we would get a null pointer instead of the implied empty string. That will become relevant when the comparison result is used.
* | | | | | | | Merge topic 'FindCUDA-arm-5.5'Brad King2013-10-261-8/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef02c9e added support for arm cross compilation with CUDA 5.5:
| * | | | | | | | added support for arm cross compilation with CUDA 5.5:Vladislav Vinogradov2013-10-241-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added CUDA_TOOLKIT_TARGET_DIR CMake variable that used to locate headers and libraries for target platform * added CUDA_TARGET_CPU_ARCH which is set to ARM for arm cross-compilation and is used to add --target-cpu-architecture NVCC flag
* | | | | | | | | Merge topic 'qt4-svg-dep'Brad King2013-10-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 656716d qt4: Fix linking with QtSvg to not include QtXml.
| * | | | | | | | | qt4: Fix linking with QtSvg to not include QtXml.Clinton Stimpson2013-10-231-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue #14505.
* | | | | | | | | Merge topic 'remove-pre-2.4-compatibility'Brad King2013-10-2653-327/+89
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d47c69 Drop compatibility with CMake < 2.4 c7c44fc CTestTest*: Update minimum required CMake to 2.4
| * | | | | | | | | Drop compatibility with CMake < 2.4Brad King2013-10-2335-309/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop all behavior activated by setting CMAKE_BACKWARDS_COMPATIBILITY to a value lower than 2.4, and generate an error when projects or the user attempt to do so. In the error suggest using a CMake 2.8.x release. Teach cmake_minimum_required to warn about projects that do not require at least CMake 2.4. They are not supported by CMake >= 3.0. Replace the documentation of CMAKE_BACKWARDS_COMPATIBILITY with a reference to policy CMP0001.