summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* VS: Provide an option to specify CUDA toolset versionBrad King2017-03-105-0/+14
| | | | | | | | The NVIDIA CUDA Toolkit provides MSBuild toolset files for integration with Visual Studio. Multiple versions may be installed so we need a way to tell our VS generators which CUDA toolset to use. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a `cuda=...` field specifying the version number.
* Merge topic 'fix-static-assert'Brad King2017-03-082-0/+6
|\ | | | | | | | | | | | | e2f25d3e WriteCompilerDetectionHeader: fix STATIC_ASSERT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !555
| * WriteCompilerDetectionHeader: fix STATIC_ASSERTDaniel Pfeifer2017-03-062-0/+6
| | | | | | | | fixes #16185
* | CUDA: Fix spelling of CudaOnly.SeparateCompilation test targetsBrad King2017-03-071-8/+8
| |
* | Autogen: Test: Add mocDepends testSebastian Holtermann2017-03-069-0/+119
| |
* | Autogen: Test: Add generated qrc file to rccDepends testSebastian Holtermann2017-03-066-9/+39
| |
* | Autogen: Test: Add generated file to moc rerun testSebastian Holtermann2017-03-065-18/+37
| |
* | Autogen: Test: Add timestamp comparison to moc rerun testSebastian Holtermann2017-03-063-15/+32
| |
* | Autogen: Test: Rename automoc_rerun test to mocRerunSebastian Holtermann2017-03-067-9/+9
| |
* | Autogen: Test: Rename autorcc_depends test to rccDependsSebastian Holtermann2017-03-065-8/+8
|/
* Merge topic 'implicit-dir-symlinks'Brad King2017-03-039-0/+74
|\ | | | | | | | | | | | | | | 69528fe6 Tests: Add case for RPATH exclusion of symlinks to implicit directories f3102ca8 Merge branch 'backport-implicit-dir-symlinks' into implicit-dir-symlinks c3fb650c cmOrderDirectories: Consider symlinks when checking implicit directories b1a37362 cmOrderDirectories: Factor out implicit directory check
| * Tests: Add case for RPATH exclusion of symlinks to implicit directoriesBrad King2017-03-029-0/+74
| | | | | | | | Issue: #16682
* | Merge topic 'autogen_uic_paths'Brad King2017-03-027-0/+100
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bf28f5e Autogen: New short InfoGet functions 154d8339 Autogen: Parse enabled feature configuration only ac77fa35 Autogen: Add missing return on error 662ad240 Autogen: Rename and merge moc related methods 5adf22bb Autogen: Add AUTOUIC_SEARCH_PATHS release notes 36fa535d Autogen: Add AUTOUIC_SEARCH_PATHS documentation 6d7c02db Autogen: Add AUTOUIC_SEARCH_PATHS test 1cdf7c1b Autogen: Add AUTOUIC_SEARCH_PATHS support 110c1bf4 Autogen: Add subDirPrefix function db431ecf Autogen: Merge FindInIncludeDirectories into FindIncludeFile
| * | Autogen: Add AUTOUIC_SEARCH_PATHS testSebastian Holtermann2017-03-027-0/+100
| | |
* | | Merge topic 'find_library-custom-lib-suffix'Brad King2017-03-027-1/+14
|\ \ \ | | | | | | | | | | | | | | | | 503f25d4 find_library: Allow custom lib suffix be used as find path
| * | | find_library: Allow custom lib suffix be used as find pathChristian Schmidbauer2017-03-017-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new `CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable to allow use of a custom suffix on `lib` directory names. This is a more general option than that added by commit v3.7.0-rc1~504^2 (Teach find_library and find_package to search lib32 paths, 2016-06-10). It allows the find path to be more deterministic on custom setups. See discussion in #10287 and #15994.
* | | | Merge topic 'csproj_add_free_source_tags'Brad King2017-03-024-0/+38
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 506207f9 VS: add test for VS_CSHARP_* source file property a202749c VS: add CSharpUtilities module 9588d0a2 VS: add VS_CSHARP_<tagname> sourcefile property
| * | | VS: add test for VS_CSHARP_* source file propertyMichael Stürmer2017-03-014-0/+38
| | |/ | |/|
* | | Merge topic 'FindPkgConfig-version-ops'Brad King2017-03-012-16/+27
|\ \ \ | | | | | | | | | | | | | | | | 8d71fa92 FindPkgConfig: use new version checking "library >= version" syntax
| * | | FindPkgConfig: use new version checking "library >= version" syntaxGautier Pelloux-Prayer2017-02-282-16/+27
| | | | | | | | | | | | | | | | Instead of the deprecated --atleast-version one.
* | | | Merge topic 'export-executable-symbols'Brad King2017-03-013-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 85e08370 bindexplib: Always export executable symbols, even they are also readable
| * | | | bindexplib: Always export executable symbols, even they are also readableZsolt Parragi2017-02-283-0/+22
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously bindexplib discarded read-only non-function symbols even in executable/code sections, but in some specific cases they could still mark functions. An example is provided by nop.asm in the AuoExportDll test, which exports a function only marked by a label. This symbol can be used from C/C++ code, but without this change it would result in an unresolved external symbol when built as a DLL on Windows.
* | | | Merge topic 'find-libarch-not-symlink'Brad King2017-03-013-0/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 6f5aede7 find_library: Skip 'lib => lib<arch>' searches if one symlinks the other e67963ed cmFindLibraryCommand: Refactor AddArchitecturePath logic
| * | | | find_library: Skip 'lib => lib<arch>' searches if one symlinks the otherBrad King2017-02-283-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FIND_LIBRARY_USE_LIB<arch>_PATHS` global properties ask `find_library` to look in `lib<arch>` directories automatically before corresponding `lib` directories. However, if `lib<arch>` is just a symlink to `lib` (or vice-versa) then we should skip adding the `lib<arch>` path. Such symlinks typically only exist to satisfy software that expects the `lib<arch>` path to be available. Fixes: #16687
| * | | | Merge branch '16449-revert-xcode-system-includes' into releaseBrad King2016-11-282-14/+5
| |\ \ \ \
| * | | | | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-181-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-181-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | | | Merge topic 'autogen_json_fix'Brad King2017-03-014-45/+46
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test
| * | | | | Autogen: Fix for Q_PLUGIN_METADATA change detection testSebastian Holtermann2017-02-264-45/+46
| | | | | |
* | | | | | Merge topic '16607-error-out-on-non-seekable-input-files'Brad King2017-02-284-1/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ded616bd cmListFileLexer: bail out on seek-errors
| * | | | | | cmListFileLexer: bail out on seek-errorsGregor Jasny2017-02-274-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we are given a FIFO, for example, we cannot seek back after trying to read a Byte-Order-Mark. Closes: #16607
* | | | | | | ExternalProject: only append `COMMAND` if actually adding a commandBen Boeckel2017-02-271-0/+10
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Fixes #16544.
* | | | | | Merge topic 'object-library-compile-pdb'Brad King2017-02-271-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library
| * | | | | | Fix COMPILE_PDB_NAME when used on an OBJECT libraryBrad King2017-02-241-0/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `COMPILE_PDB_NAME` is used without `COMPILE_PDB_OUTPUT_DIRECTORY` we cannot fall back on the link `PDB_OUTPUT_DIRECTORY` for an object library because it has no link step. Fixes: #16674
* | | | | | Merge topic 'test-objlib-deps-cleanup'Brad King2017-02-2710-36/+38
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | b35a949b Tests: Change RunCMake.ObjectLibrary dependencies case to C 01347954 Tests: Fix RunCMake.ObjectLibrary dependency delay
| * | | | | Tests: Change RunCMake.ObjectLibrary dependencies case to CBrad King2017-02-2610-31/+27
| | | | | |
| * | | | | Tests: Fix RunCMake.ObjectLibrary dependency delayBrad King2017-02-261-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sleep before the second copy to avoid the need for a touch. Sleep for longer on generators whose build tools have low resolution timestamps.
* | | | | | Merge topic '16615-xcode-object-libraries-depends'Brad King2017-02-246-0/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 624021a0 Add test for object library dependencies 5da9266a Xcode: Always track object library dependencies via hacky Makefile e80ac953 Xcode: Record dependency information also for object libraries 9293e57d Xcode: Collect dummy rules during iteration and emit afterwards 33a1d727 Makefile: Allow adding post-build rules to object libraries
| * | | | | Add test for object library dependenciesGregor Jasny2017-02-226-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | Issue: #16615
* | | | | | Merge topic 'autogen_depends'Brad King2017-02-2410-6/+46
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62a1e292 Autogen: Add hint to SKIP_AUTOMOC in error message e98465cf Autogen: Add Quote function and use it for logging 96f6f392 Autogen: Add AUTOMOC_DEPEND_FILTERS documentation 94e3f82c Autogen: Add AUTOMOC_DEPEND_FILTERS test 70ebf35c Autogen: Add AUTOMOC_DEPEND_FILTERS support 2a6fd432 Autogen: Single point of return in Run() method e9a8a207 Autogen: Log simplifications
| * | | | | Autogen: Add AUTOMOC_DEPEND_FILTERS testSebastian Holtermann2017-02-2210-6/+46
| | | | | |
* | | | | | Merge topic 'clang-format-attrs'Brad King2017-02-234-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5f39a56 clang-format.bash: Use Git attributes to mark files for formatting f6986ee4 Define a custom Git attribute to mark sources using our C style 2256c3a7 Define a custom Git attribute to mark source files as generated
| * | | | | clang-format.bash: Use Git attributes to mark files for formattingBrad King2017-02-224-0/+8
| | | | | |
* | | | | | Merge topic 'autogen_json'Brad King2017-02-2236-13/+575
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test d60f1ddc Autogen: Documentation update cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support 8b13a52c Autogen: Tests: Set different compression levels in rcc test 9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation 0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function 754d4318 Autogen: Sort AutogenInfo.cmake.in cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test 39c4819e Autogen: Tests: Add moc include tests 50805693 Autogen: Tests: Clean comments c23206b6 Autogen: Log simplifications 347572cf Autogen: Only touch an unchanged moc_compilation.cpp 03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes 3ec230de Autogen: Use GetRealPath in central places only 41fb64e7 Autogen: Search moc includes in include directories 175c8900 Autogen: Sort includes before composing include options ...
| * | | | | | Autogen: Don't use .moc include in Q_PLUGIN_METADATA testSebastian Holtermann2017-02-212-12/+8
| | | | | | |
| * | | | | | Autogen: Tests: Set different compression levels in rcc testSebastian Holtermann2017-02-211-0/+11
| | | | | | |
| * | | | | | Autogen: Tests: Add Q_PLUGIN_METADATA testSebastian Holtermann2017-02-2117-2/+203
| | | | | | |
| * | | | | | Autogen: Tests: Add moc include testsSebastian Holtermann2017-02-2119-0/+354
| | | | | | |
| * | | | | | Autogen: Tests: Clean commentsSebastian Holtermann2017-02-211-11/+11
| | |/ / / / | |/| | | |