summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | | ExternalData: Tolerate files duplicated across multiple targetsBrad King2016-09-073-0/+27
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple ExternalData_Target_Add calls generate the same output file then we need to avoid calling add_custom_command multiple times with that output. This was already done within a single target by setting a variable in the local function scope. This will not be visible in other calls though so we need to use a directory property instead to prevent adding a custom command multiple times for one output in a directory. Normally it is not safe to have multiple custom commands that produce the same output file across multiple independent targets, but since we use atomic replacement of outputs the resulting races should not be a problem. For the convenience of projects, tolerate this instead of diagnosing it. In particular, we previously allowed up to two copies of the custom command in one directory because CMake has a fallback from MAIN_DEPENDENCY to an `<output>.rule` file. While at it, add a note to the documentation that typically only one external data target should be needed for a project. Reported-by: David Manthey <david.manthey@kitware.com>
* | Merge topic 'cpack-deb-package-description-fallback'Brad King2016-09-074-7/+10
|\ \ | | | | | | | | | | | | 332b089a CPack/DEB: Make package description variable precedence match RPM
| * | CPack/DEB: Make package description variable precedence match RPMDomen Vrankar2016-09-074-7/+10
| |/ | | | | | | | | | | | | | | | | Make `CPACK_DEBIAN_PACKAGE_DESCRIPTION` fallback variable precedence match CPackRPM behavior as much as possible. This is technically a breaking change, but the new behavior is more consistent with expectation anyway. Closes: #16272
* | cmMakefile: Restore nested error logic use of cmExecutionStatusBrad King2016-09-065-0/+45
|/ | | | | | | | | | | | | | Since commit 14a8d61f (cmMakefile: Port nested error logic away from cmExecutionStatus) we fail to continue processing function and macro bodies after non-fatal errors. A non-fatal error should not stop foreach loops, macro bodies, nested bodies, or the outer script. Add a test covering these cases, and revert the change to fix them. Also revert commit 2af853de (cmMakefile: Simplify IssueMessage implementation) because the assertion it added (which was removed by the above commit and is restored by reverting it) is incorrect. We do have code paths that call cmMakefile::IssueMessage with an empty execution stack, such as in CheckForUnusedVariables's LogUnused call.
* Merge topic 'genex-LINK_ONLY-not-linking'Brad King2016-09-064-0/+11
|\ | | | | | | | | f6fd0abc Genex: Diagnose invalid LINK_ONLY usage instead of crashing
| * Genex: Diagnose invalid LINK_ONLY usage instead of crashingBrad King2016-09-054-0/+11
| | | | | | | | | | | | | | | | When `$<LINK_ONLY:...>` is used outside of linking we may evaluate it without a `dagChecker`. Do not dereference the NULL pointer and issue a diagnostic instead. Closes: #16287
* | Merge topic 'test-GenerateExportHeader-with-RunCMake'Brad King2016-09-0639-50/+38
|\ \ | | | | | | | | | | | | | | | | | | 72ecdd34 Tests: Cleanup RunCMake.GenerateExportHeader somewhat fc3dab0e Tests: Port GenerateExportHeader test to RunCMake infrastructure 4feba34d GNU: Do not use -fvisibility on AIX or HP-UX
| * | Tests: Cleanup RunCMake.GenerateExportHeader somewhatBrad King2016-09-0511-51/+14
| | |
| * | Tests: Port GenerateExportHeader test to RunCMake infrastructureBrad King2016-09-0540-1/+26
| | | | | | | | | | | | This will allow build failure cases to be added later.
* | | Merge topic 'cpack-deb-long-filenames'Brad King2016-09-067-0/+59
|\ \ \ | | | | | | | | | | | | | | | | 4ffdd564 CPack/DEB: Add option to select archive type
| * | | CPack/DEB: Add option to select archive typeDomen Vrankar2016-09-057-0/+59
| | |/ | |/| | | | | | | | | | | | | | | | Add a `CPACK_DEBIAN_ARCHIVE_TYPE` option that can be used to select an archive type that supports long file names. Closes: #14332
* | | Merge topic 'macro-parenthesis'Brad King2016-09-062-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 1a9de803 surround macro arguments with parentheses
| * | | surround macro arguments with parenthesesDaniel Pfeifer2016-09-052-3/+3
| |/ /
* | | use CM_NULLPTRDaniel Pfeifer2016-09-052-2/+3
|/ /
* | Tests/CMakeLib: include what you useDaniel Pfeifer2016-09-033-4/+7
| |
* | Tests/CMakeLib: use cmsys::ifstreamDaniel Pfeifer2016-09-032-10/+16
|/
* Merge topic '16101-xcode-fix-directory-exclude-from-all'Brad King2016-08-317-0/+36
|\ | | | | | | | | df32e564 Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
| * Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)Gregor Jasny2016-08-317-0/+36
| |
* | Merge topic 'FindMatlab-additional-components'Brad King2016-08-312-0/+24
|\ \ | | | | | | | | | | | | bf09271b FindMatlab: adding handling of component "MAT"
| * | FindMatlab: adding handling of component "MAT"Raffi Enficiaud2016-08-302-0/+24
| | | | | | | | | | | | | | | | | | - documentation - test - cosmetic changes
* | | Merge topic 'syntax-unexpected-eof'Brad King2016-08-314-0/+9
|\ \ \ | | | | | | | | | | | | | | | | 1dda2ec5 Improve error message on unexpected end of file
| * | | Improve error message on unexpected end of fileBrad King2016-08-304-0/+9
| | | | | | | | | | | | | | | | Suggested-by: Stephen Kelly <steveire@gmail.com>
* | | | Merge topic 'import-libuv'Brad King2016-08-314-0/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39ac889d cmake: Add trivial usage of libuv 7cf369fe Do not build libuv on HP-UX 075cae51 Do not build libuv on SPARC 9a53af40 Do not build libuv on Cygwin 219f7411 Do not build libuv on Mac OS X 10.4 and lower 8a5beef3 Add option to build CMake against a system libuv e56aa462 FindLibUV: Add module to find libuv package 551d5aed libuv: Fix unused variable warning in uv_loop_close f4f8074b libuv: Avoid including macOS CoreServices header globally a63aaaed libuv: Always include our own header first 9130b53a libuv: Conditionally declare Windows APIs for VS 2008 and below b52afa46 libuv: Fix anonymous union syntax 05dbc204 libuv: Fix Windows API function typedef syntax 75139374 libuv: Install LICENSE file with CMake documentation 95dcc4e4 libuv: Disable warnings to avoid changing 3rd party code 13b7e758 libuv: Build the library within CMake ...
| * | | | FindLibUV: Add module to find libuv packageBrad King2016-08-314-0/+38
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Add it to a private source directory that is not installed so that we can use it for building CMake itself. This will allow it to mature before being distributed publicly.
* | | | Utilities/Release: Drop Linux 32-bit binaryBrad King2016-08-301-2/+0
| |/ / |/| | | | | | | | | | | | | | | | | The Linux distro we've been using for this is so old that it limits our ability to import newer third-party software. Until a new machine can be configured to provide this binary we can simply drop it. Users will still be able to build from source or use a distro-provided version.
* | | Merge topic 'ninja-add_custom_command-depfile'Brad King2016-08-307-0/+34
|\ \ \ | |_|/ |/| | | | | | | | 048d1adb add_custom_command: Add DEPFILE option for Ninja
| * | add_custom_command: Add DEPFILE option for NinjaKulla Christoph2016-08-307-0/+34
| |/ | | | | | | | | | | | | | | Provide a way for custom commands to inform the ninja build tool about their implicit dependencies. For now simply make use of the option an error on other generators. Closes: #15479
* | CPack/RPM: Add test for debuginfo package generationDomen Vrankar2016-08-264-0/+44
|/
* Merge topic 'extract-cmMessenger'Brad King2016-08-2519-119/+75
|\ | | | | | | | | | | | | | | | | | | 1462576b Parser: Port away from cmMakefile 421012a3 cmMessenger: Extract from cmake class 14a8d61f cmMakefile: Port nested error logic away from cmExecutionStatus 2af853de cmMakefile: Simplify IssueMessage implementation 33bb9cfa Parser: Issue messages through cmake, not cmSystemTools db7de303 Parser: Store the Backtrace for use in issuing messages
| * Parser: Issue messages through cmake, not cmSystemToolsStephen Kelly2016-08-2519-119/+75
| | | | | | | | | | Make these messages uniform with regard to other messages issued by cmake.
* | Tests: Fix RunCMake.CMP0040 custom command syntaxBrad King2016-08-245-5/+5
|/
* Merge topic 'android-platform-modules'Brad King2016-08-2452-0/+572
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b637ebd Android: Add `ANDROID` variable to indicate the target c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains 6b84df8d Help: Document cross compiling for Android d7d40830 Android: Select the STL type for NDK builds b22294bc Android: Populate compiler flags for current ABI b6a3102a Android: Add a CMAKE_BUILD_TYPE default d1e3cec2 Android: Add Clang -target option for current ABI 504db72d Android: Add placeholders for compiler/abi-specific settings fa632578 Android: Avoid interfering with common pre-existing toolchain files 6299693f Android: Search for NDK and standalone toolchain in more places 29b51379 Android: Detect and save a standalone toolchain without the NDK 7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set 4389664a Android: Detect and save a toolchain from the NDK 328191f6 Android: Set CMAKE_SYSROOT automatically 9e032304 Android: Detect and save the architecture, ABI, and processor fde59c4d Android: Detect and save the API level ...
| * Android: Add `ANDROID` variable to indicate the targetBrad King2016-08-231-0/+4
| | | | | | | | | | Allow projects to use `if(ANDROID)` to condition their Android-specific code paths.
| * Android: Add test cases covering use of the NDK and standalone toolchainsBrad King2016-08-2352-0/+568
| |
* | Merge topic 'extend-find-package-search-path'Brad King2016-08-247-2/+34
|\ \ | | | | | | | | | | | | | | | 828d6c13 find_package: Extend search path for combined Windows/UNIX convention ff5c89de Help: Widen find_package search path table
| * | find_package: Extend search path for combined Windows/UNIX conventionSilvio Traversaro2016-08-247-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | Find packages that install their cmake package configuration files in `lib/cmake/<name>` when they are installed in the default Windows CMAKE_INSTALL_PREFIX, `C:/Program Files/<name>`. Closes: #16212
* | | Tests: Refactor testing of extra generators.Chaoren Lin2016-08-231-47/+30
|/ / | | | | | | Use a loop instead of repeating the same thing multiple times.
* | Merge topic 'readability-named-parameter'Brad King2016-08-175-5/+5
|\ \ | | | | | | | | | | | | e7b842e1 Make sure unnused parameters are /*named*/
| * | Make sure unnused parameters are /*named*/Daniel Pfeifer2016-08-165-5/+5
| | |
* | | Merge topic 'include-what-you-use'Brad King2016-08-172-0/+11
|\ \ \ | | | | | | | | | | | | | | | | a2af850b fix a batch of include-what-you-use violations
| * | | fix a batch of include-what-you-use violationsDaniel Pfeifer2016-08-162-0/+11
| |/ /
* | | cmake: Add `cmake -E capabilities` modeTobias Hunger2016-08-164-0/+5
|/ / | | | | | | | | | | | | Add `cmake -E capabilities` to report on generators, cmake version and possibly other static capabilities of cmake. Closes: #15462
* | Merge topic 'ExternalProject-SOURCE_SUBDIR'Brad King2016-08-163-0/+24
|\ \ | | | | | | | | | | | | a8345d65 ExternalProject: Add SOURCE_SUBDIR option
| * | ExternalProject: Add SOURCE_SUBDIR optionMatthew Woehlke2016-08-163-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new SOURCE_SUBDIR option to ExternalProject_Add that allows specifying the location of the CMakeLists.txt to use as the project root relative to the SOURCE_DIR. This is helpful for projects that have unusual layouts, or projects that provide both a superbuild and project-only build depending on which CMakeLists.txt is used. Fixes: #15118
* | | Merge topic 'issue-tracker-urls'Brad King2016-08-162-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 2bdba83e issues: update references to the CMake issue tracker
| * | | issues: update references to the CMake issue trackerBen Boeckel2016-08-152-3/+3
| | |/ | |/| | | | | | | | | | References to specific comments are left as-is since comments were not migrated.
* | | Merge topic 'autogen-same-name'Brad King2016-08-1521-0/+237
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 61a607e8 Help: Document AUTORCC behavior for same .qrc name case e4f508e4 Tests/QtAutogen: Test same moc/qrc source names in different directories 4e9b97d7 QtAutogen: Allow multiple qrc files with the same name 41c9e14a QtAutogen: Allow multiple moc files with the same name 3c3b37b0 QtAutogen: Use std:: instead of ::std:: 0a5dd3c7 cmFilePathUuid: Add class to generate deterministic unique file names
| * | Tests/QtAutogen: Test same moc/qrc source names in different directoriesSebastian Holtermann2016-08-1021-0/+237
| | |
* | | Merge topic '15687-xcode-support-system-include'Brad King2016-08-102-5/+14
|\ \ \ | | | | | | | | | | | | | | | | 93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)
| * | | Xcode: Obey SYSTEM keyword for includes (#15687)Gregor Jasny2016-08-092-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake used to put all header search paths into HEADER_SEARCH_PATHS attribute. Unfortunately this attribute does not support to declare a search path as a system include. As a hack one could add a -isystem /path to the cflags but then include ordering is not deterministic. A better approach was chosen with this patch by not filling HEADER_SEARCH_PATHS at all and to populate the C, C++, and Fortran flags directly. The include paths used by Xcode should be now identical to the ones used by Unix Makefiles and Ninja generator.