summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Revert "add_custom_command: Diagnose MAIN_DEPENDENCY limitation."Nils Gladitz2015-04-301-1/+2
| | | | | | | | | | | | This reverts commit 242c3966 (add_custom_command: Diagnose MAIN_DEPENDENCY limitation, 2015-03-09) and the follow up commit b372a99a (UseSWIG: Do not use MAIN_DEPENDENCY on custom commands, 2015-03-26). I misdiagnosed the underlying issue that prompted creation of policy CMP0057. The actual issue surfaces when a single custom command's MAIN_DEPENDENCY is listed in more than one target; this issue will have to be addressed independently.
* Merge topic 'InstallRequiredSystemLibraries-fix-mbcs'Brad King2015-04-281-7/+2
|\ | | | | | | | | ff183986 InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)
| * InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)Bjoern Thiel2015-04-271-7/+2
| | | | | | | | | | | | | | Fix the logic added by commit v3.0.0-rc5~9^2 (InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12, 2014-05-06). Do not test content of MSVC${v}_MFC_DIR until after the variable is set.
* | ctest: Consolidate documentation of CTEST_USE_LAUNCHERS (#15533)Brad King2015-04-281-12/+3
| | | | | | | | | | | | | | | | | | The documentation of this variable in the CTest module is outdated and has been superseded by the ctest(1) manual. In particular, the latter mentions that it works with the Ninja generator as well as makefile generators. Remove the documentation from the CTest module and replace it with a link to the main variable documentation (which already references the ctest(1) manual).
* | Modules/CTest: Improve documentation formattingBrad King2015-04-281-34/+26
| | | | | | | | Use inline reStructuredText markup and add cross-references.
* | Modules/CTest: Use bracket comment for documentation blockBrad King2015-04-281-65/+66
|/
* Merge topic 'allow-empty-CMAKE_TOOLCHAIN_FILE'Brad King2015-04-231-1/+1
|\ | | | | | | | | 22926dd6 Allow CMAKE_TOOLCHAIN_FILE to be an empty string
| * Allow CMAKE_TOOLCHAIN_FILE to be an empty stringAndrey Pokrovskiy2015-04-221-1/+1
| | | | | | | | | | Do not try to include() an empty string in the generated CMakeSystem module.
* | Merge topic 'check-compiler-flag-clang'Brad King2015-04-231-0/+1
|\ \ | |/ |/| | | | | 680ebebc Check*CompilerFlag: Add another pattern for Clang (#15526)
| * Check*CompilerFlag: Add another pattern for Clang (#15526)Dan Kegel2015-04-221-0/+1
| | | | | | | | Match 'optimization flag ... not supported' messages.
* | ExternalProject: Allow dependencies on INTERFACE librariesBrad King2015-04-221-4/+16
| | | | | | | | | | Respect INTERFACE library property whitelist. Check that a target has type "UTILITY" before querying other properties.
* | ExternalProject: Fix error message typoBrad King2015-04-211-1/+1
| |
* | ExternalProject: Allow generator expressions with LOG_* options (#15287)Andrey Pokrovskiy2015-04-211-4/+10
| | | | | | | | | | | | Use file(GENERATE) to write the logging wrapper scripts to evaluate generator expressions. Use a per-config script names in case the content varies by configuration.
* | ExternalProject: Allow generator expressions in initial cache optionsAndrey Pokrovskiy2015-04-211-5/+6
|/ | | | | | Use file(GENERATE) to write the initial cache file so that we can evaluate generator expressions. Use a per-config initial cache file name in case the content varies by configuration.
* Merge topic 'cpack-deb-component-vars-prepare'Brad King2015-04-211-196/+223
|\ | | | | | | | | c8375e15 CPackDeb: Refactor package variable lookup by generator
| * CPackDeb: Refactor package variable lookup by generatorDomen Vrankar2015-04-211-196/+223
| | | | | | | | | | | | | | | | Preparation for per component variables. Patch makes sure we know which variables will be set for per component generator and also prevents accidental overflows of variable values between components.
* | Merge topic 'FindCUDA.cmake/Fix-MakeDirDuringSeparableCompilation'Brad King2015-04-211-0/+2
|\ \ | |/ |/| | | | | 0ed22502 FindCUDA: Create output dir while compiling intermediate link file (#15016)
| * FindCUDA: Create output dir while compiling intermediate link file (#15016)James Bigler2015-04-201-0/+2
| | | | | | | | | | | | | | | | During compilation of the intermediate link file, the output directory may not be present in Visual Studio builds. This fix makes sure the output directory exists before generating the output file. Suggested-by: Irwin Zaid
* | Merge topic 'cpack-rpm-refactored-file-listing'Brad King2015-04-211-70/+129
|\ \ | | | | | | | | | | | | | | | | | | cd953bf7 Help: Add notes for topic 'cpack-rpm-refactored-file-listing' 76080c32 CPackRPM content listing refactor 152e9b32 CPackRPM package content list code move
| * | CPackRPM content listing refactorDomen Vrankar2015-04-191-29/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of content list that removes use of find and sed to make listing algorithm more clear and remove external dependencies. Patch also limits man pages handling to locations listed in brp-compress rpm script by default - fixes bug report #14660.
| * | CPackRPM package content list code moveDomen Vrankar2015-04-191-70/+77
| | | | | | | | | | | | | | | Move rpm package content list code to a separate function.
* | | Merge topic 'add-GreenHills-MULTI-generator'Brad King2015-04-206-1/+124
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 66b641f4 Help: Add notes for topic 'add-GreenHills-MULTI-generator' 48004d9d Add a 'Green Hills MULTI' generator on Windows 051d8be1 cmLocalGenerator: Constify some cmTarget and cmGeneratorTarget arguments
| * | Add a 'Green Hills MULTI' generator on WindowsGeoff Viola2015-04-206-1/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Green Hills MULTI is an IDE for embedded real-time systems. The IDE's product page can be found here: http://www.ghs.com/products/MULTI_IDE.html It supports cross compiling on ARM, Intel x86, and other architectures with various operating systems. The IDE exists on Linux and Windows host systems, but CMake will currently only generate the project files on Windows host systems.
* | | Merge topic 'FPHSA-updates'Brad King2015-04-171-126/+140
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 84f06d0c FPHSA: Document REQUIRED_VARS recommendation (#15352) a3ad275c FPHSA: Revise and format documentation d1a6d15b FPHSA: Always populate the ExactCase_FOUND variable (#15412).
| * | FPHSA: Document REQUIRED_VARS recommendation (#15352)Brad King2015-04-171-0/+4
| | | | | | | | | | | | State explicitly that the variables specified are user-facing.
| * | FPHSA: Revise and format documentationBrad King2015-04-171-110/+123
| | | | | | | | | | | | Use better reStructuredText markup and add cross-references.
| * | FPHSA: Always populate the ExactCase_FOUND variable (#15412).Stephen Kelly2015-04-171-31/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UPPERCASE name was inconsistent with config-packages, the find_dependency macro, and even FPHSA itself, which expects components to be specified with names matching ExactCase. The FOUND_VAR was only permitted to have two possible values, and now both are set for compatibility. Document it as obsolete, and adjust the code for the same. Users of the variable should just remove it.
* | | UseSWIG: Fix module name detection with relative source file (#15508)Tuukka Pasanen2015-04-151-1/+1
|/ / | | | | | | | | | | | | When SWIG_GET_EXTRA_OUTPUT_FILES checks to see if a source file exists for use in reading the module name, it must pass an absolute path to the if(EXISTS) command. Teach SWIG_ADD_SOURCE_TO_MODULE to give it the absolute path it already knows.
* | CTestCoverageCollectGCOV: Write tar files intended for CDash in gnutar formatNils Gladitz2015-04-101-0/+1
| | | | | | | | | | PHP's PharData can not currently (PHP 5.6.4) extract paxr tar archives with long filenames.
* | FindCUDA: Add specific cuda_language_flag instead of using nvcc.James Bigler2015-04-092-1/+5
| | | | | | | | | | | | I was previously appending to nvcc_flags inside the file loop. This caused the flag to be appended multiple times which freaks out nvcc. Now the flag is specifically handled per file.
* | FindCUDA: Allow setting CUDA_SOURCE_PROPERTY_FORMAT for non-.cu files.James Bigler2015-04-091-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | A previously undocumented feature allowed overriding the format specified to CUDA_WRAP_SRCS with a source file property called CUDA_SOURCE_PROPERTY_FORMAT. I added documentation for this feature as well as added the ability to let nvcc compile any file regardless of type if this property was found. In addition, I also fixed a couple of bugs with the calls to _cuda_get_important_host_flags that weren't garding the arguments with "" to prevent empty values from causing errors.
* | Merge topic 'FindCUDA.cmake/C++11Flags'Brad King2015-04-091-0/+13
|\ \ | |/ |/| | | | | 99abebde FindCUDA: Handle c++11 host flag
| * FindCUDA: Handle c++11 host flagJames Bigler2015-04-081-0/+13
| | | | | | | | | | | | | | | | | | | | If the host flags contain a c++11 flag (at least for gcc), then we can't automatically propagate to nvcc it using -Xcompiler. This is because nvcc can't use any C++ only flags. Instead we find this flag and add it to nvcc's flags (it has a special flag for dealing with c++11 code) and remove it from the host flags. Co-Author: Guillermo Marcus <gmarcus@nvidia.com>
* | Merge topic 'FindMatlab_add_recent_versions'Brad King2015-04-081-0/+2
|\ \ | | | | | | | | | | | | 7e311773 FindMatlab: Look for R2014b and R2015a
| * | FindMatlab: Look for R2014b and R2015aDaniele E. Domenichelli2015-04-071-0/+2
| | |
* | | Features: VS 2013 Update 3 supports initializer lists (#15494)Brad King2015-04-061-6/+11
|/ / | | | | | | | | | | | | | | | | | | | | VS 2013 originally claimed to support initializer lists but a bug was found in which it generated bad code silently. For this reason we previously considered support to not be present. However, Update 3 adds a hard error on cases that previously generated bad code, so it is now safe to use initializer lists with VS 2013 Update 3 or greater. At worst a compiler error will be issued in the cases that do not work, but that is no different from any other compiler-specific workaround a project code may need.
* | Merge topic 'gcov-module-coverage-exclude'Brad King2015-04-061-1/+30
|\ \ | | | | | | | | | | | | 9a544f2d CTestCoverageCollectGCOV: Support CTEST_CUSTOM_COVERAGE_EXCLUDE
| * | CTestCoverageCollectGCOV: Support CTEST_CUSTOM_COVERAGE_EXCLUDENils Gladitz2015-04-041-1/+30
| | |
* | | FindCUDA: Use the static CUDA runtime library if available (#15482)James Bigler2015-04-031-4/+81
|/ / | | | | | | | | | | | | | | | | | | Beginning in CUDA 5.5 a static version of the cuda runtime library became available. Since nvcc defaults to using this library over the shared version, FindCUDA will also default to using this version. There are many advantages to using the static version (most importantly to avoid conflicts with multiple versions when building a CUDA based library). Offer a CUDA_USE_STATIC_CUDA_RUNTIME option to control this behavior.
* | Merge topic 'cpack-rpm-basic-symlink-handling'Brad King2015-03-311-21/+341
|\ \ | | | | | | | | | | | | | | | 68e13e98 Help: Add notes for topic 'cpack-rpm-basic-symlink-handling' 681f3a2f CPackRPM: Add basic symlink support (#15209)
| * | CPackRPM: Add basic symlink support (#15209)Domen Vrankar2015-03-311-21/+341
| | | | | | | | | | | | | | | | | | | | | RPM packages can contain symbolic links to relative paths - including support for multiple relocation paths through generation of post install relocation scripts. Add basic support with limitations described in documentation.
* | | UseSWIG: Do not use MAIN_DEPENDENCY on custom commands (#15480)Felix Schwitzer2015-03-301-2/+1
|/ / | | | | | | | | | | | | | | | | Add the dependency on the main swig input source file as a normal DEPENDS option. We cannot use MAIN_DEPENDENCY because if there are multiple target languages then multiple custom commands would want to use the same MAIN_DEPENDENCY, but at most one custom command may specify a given source file as its MAIN_DEPENDENCY. Exposed by a CMP0057 warning.
* | Merge topic 'ExternalData-recursive-match'Brad King2015-03-301-7/+28
|\ \ | | | | | | | | | | | | | | | 230f2d6e ExternalData: Add option to recursively match under directories 564c07f7 ExternalData: Parameterize internal file(GLOB) operation selection
| * | ExternalData: Add option to recursively match under directoriesBrad King2015-03-271-3/+20
| | | | | | | | | | | | | | | | | | Extend the ``DATA{Dir/,...}`` syntax with a new ``RECURSE:`` option to enable recursive matching of associated files. This will allow an entire directory tree of data to be referenced at once.
| * | ExternalData: Parameterize internal file(GLOB) operation selectionBrad King2015-03-271-6/+10
| | | | | | | | | | | | | | | | | | Extend the _ExternalData_arg_find_files signature with an option to specify the kind of file(GLOB) operation to be performed. Set CMP0009 to NEW so that GLOB_RECURSE does not follow symlinks.
* | | Xcode: Set ARCHS only when CMAKE_OSX_ARCHITECTURES is specified (#14736)Brad King2015-03-271-1/+0
| | | | | | | | | | | | | | | | | | Teach the Xcode generator that ONLY_ACTIVE_ARCH=YES means to use ARCHS, and that the default of ONLY_ACTIVE_ARCH=NO means to use NATIVE_ARCH and ignore ARCHS. In the latter case there is no reason to generate ARCHS.
* | | Merge topic 'fix-external-project-generator'Brad King2015-03-271-1/+4
|\ \ \ | | | | | | | | | | | | | | | | a704098d ExternalProject: fix the build command for generator overrides
| * | | ExternalProject: fix the build command for generator overridesBen Boeckel2015-03-261-1/+4
| |/ / | | | | | | | | | | | | | | | The `binary_dir` variable is never set, so this is invalid. Instead, use "." which all the other build commands use anyways. Also only set the --config option if it is meaningful.
* | | Merge topic 'FindMFC-CMP0054'Brad King2015-03-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | dcf29800 FindMFC: Use if(DEFINED) to simplify condition (#15477)
| * | | FindMFC: Use if(DEFINED) to simplify condition (#15477)Brad King2015-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace an old hack of the form 'if("${VAR}" MATCHES "^${VAR}$")' with the much simpler 'if(NOT DEFINED ${VAR})'. This was exposed by a CMP0054 warning.