summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | CTestTest*: Update minimum required CMake to 2.4Brad King2013-10-2318-18/+18
| |/ / / / | | | | | | | | | | | | | | | We will soon deprecate support for compatibility with CMake < 2.4.
* | | | | Merge topic 'fix-tll-static-private'Brad King2013-10-264-9/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 239b0c6 Don't add invalid content to static lib INTERFACE_LINK_LIBRARIES.
| * | | | | Don't add invalid content to static lib INTERFACE_LINK_LIBRARIES.Stephen Kelly2013-10-264-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'cmarray-templates'Brad King2013-10-261-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dfe0c21 cmArray: Use macro variant of cmArray{Begin,Size,End} for old GCC.
| * | | | | | cmArray: Use macro variant of cmArray{Begin,Size,End} for old GCC.Stephen Kelly2013-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not capable of using the template versions.
* | | | | | | Merge topic 'remove-old-commands-by-policy'Brad King2013-10-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ea27bc Cygwin: Avoid legacy warnings in RunCMake.DisallowedCommands test
| * | | | | | | Cygwin: Avoid legacy warnings in RunCMake.DisallowedCommands testBrad King2013-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the minimum required version of CMake high enough to avoid the warning for CMAKE_LEGACY_CYGWIN_WIN32. The warning appears on stderr and breaks the expected output matching.
* | | | | | | | CMake Nightly Date StampKitware Robot2013-10-261-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-10-251-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'minor-cleanups'Brad King2013-10-243-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3f49ff Docs: Fix typo b0686fd Docs: Fix typo.
| * | | | | | | Docs: Fix typoStephen Kelly2013-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opitions -> options.
| * | | | | | | Docs: Fix typo.Stephen Kelly2013-10-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependee -> depender.
* | | | | | | | Merge topic 'cmake-syntax-updates'Brad King2013-10-2418-45/+147
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2945814 cmRST: Teach cmake-module directive to scan bracket comments 8bb2ee9 cmake-developer.7: Improve flow of module documentation instructions efcf318 Add \-continuation to CMake language quoted arguments
| * | | | | | | cmRST: Teach cmake-module directive to scan bracket commentsBrad King2013-10-236-27/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scanning CMake module files for .rst comments, recognize bracket comments starting in ".rst:" too. For example: #[[.rst: Include the bracket comment content terminated by the closing bracket. Exclude the line containing the bracket if it starts in "#". Teach the CMakeLib.testRST test to cover multiple bracket lengths and ending brackets on lines with and without "#". Update the cmake-developer.7 manual to document the bracket-comment syntax for .rst documentation.
| * | | | | | | cmake-developer.7: Improve flow of module documentation instructionsBrad King2013-10-231-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use prose instead of enumerated steps and re-order the steps so that the cmake-module directive is covered contiguously.
| * | | | | | | Add \-continuation to CMake language quoted argumentsBrad King2013-10-2312-2/+28
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the CMake language lexer to treat the \-LF pair terminating a line ending in an odd number of backslashes inside a quoted argument as a continuation. Drop the pair from the returned quoted argument token text. This will allow long lines inside quoted argument strings to be divided across multiple lines in the source file. It will also allow quoted argument text to start on the line after the opening quote. For example, the code: set(x "\ ...") sets variable "x" to the value "..." with no opening newline. Previously an odd number of backslashes at the end of a line inside a quoted argument would put a \-LF pair (or a \-CR pair) literally in the argument. Then the command-argument evaluator would complain that the \-escape sequence is invalid. Therefore this syntax is available to use without changing behavior of valid existing code. Teach the RunCMake.Syntax test to cover cases of quoted arguments with lines ending in \, \\, and \\\. Odd counts are continuations.
* | | | | | | CMake Nightly Date StampKitware Robot2013-10-241-1/+1
|/ / / / / /
* | | | | | Merge topic 'FindJava-msg'Brad King2013-10-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c832299 FindJava: fix message output (#14502)
| * | | | | | FindJava: fix message output (#14502)Rolf Eike Beer2013-10-221-1/+1
| |/ / / / /
* | | | | | Merge topic 'output-CMP0022-entries'Brad King2013-10-232-1/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b3b336 CMP0022: Output link interface mismatch for static library warning
| * | | | | | CMP0022: Output link interface mismatch for static library warningStephen Kelly2013-10-232-1/+35
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge topic 'vs-graceful-empty-compiler'Brad King2013-10-234-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 705ae00 Quote ${CMAKE_<LANG>_COMPILER} while enabling a language 18a2537 CMakeDetermineCompilerId: Do not test vendor without a compiler
| * | | | | | Quote ${CMAKE_<LANG>_COMPILER} while enabling a languageBrad King2013-10-224-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though this variable gets set to CMAKE_<LANG>_COMPILER-NOTFOUND when the compiler is not found, CMake<LANG>Compiler.cmake gets removed by cmGlobalGenerator::EnableLanguage so in try compiles the value is empty. Quote references to the variable in Modules/CMake(C|CXX|Fortran)Information.cmake Modules/CMakeDetermineCompilerId.cmake to avoid dropping arguments from commands that expect them.
| * | | | | | CMakeDetermineCompilerId: Do not test vendor without a compilerBrad King2013-10-221-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | If no CMAKE_${lang}_COMPILER is available then do not try to run it to determine the compiler vendor.
* | | | | | Merge topic 'doc-cmake-developer'Brad King2013-10-235-189/+512
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0ce6f0 cmRST: Cross-reference cmake-developer.7 manual and cmRST Doxygen c1c239b Help: Add documentation format to cmake-developer.7 manual a06a90f Help: Organize cmake-developer.7 manual Modules section 28f08ba Help: Fix module documentation markup in cmake-developer.7 manual baaab06 Help: Move Modules/readme.txt content into cmake-developer.7 manual 80a311e Help: Add cmake-developer.7 manual
| * | | | | | cmRST: Cross-reference cmake-developer.7 manual and cmRST DoxygenBrad King2013-10-222-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmRST implementation and the list of capabilities documented in the cmake-developer.7 manual must be kept in sync. Add a note to each file to reference the other.
| * | | | | | Help: Add documentation format to cmake-developer.7 manualBrad King2013-10-221-0/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how CMake uses reStructuredText to provide the help manuals. Cover supported inline markup and directives, the CMake Domain in Sphinx, and cross-reference syntax.
| * | | | | | Help: Organize cmake-developer.7 manual Modules sectionBrad King2013-10-222-51/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Module Documentation" and "Find Modules" subsections. Add to Modules/readme.txt a textual reference to the cmake-developer.7 manual and, while at it, fix the wiki URL domain.
| * | | | | | Help: Fix module documentation markup in cmake-developer.7 manualKitware Robot2013-10-221-102/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the content moved from Modules/readme.txt to valid reStructuredText markup. Mainly, convert the lists of variables to definition lists, wrap long lines in paragraph text, and add literal block markup and indentation.
generated by cgit v0.12 at 2025-09-10 22:06:42 (GMT)