summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindMatlab-mingw'Brad King2016-08-161-1/+5
|\ | | | | | | | | 8ba204a6 FindMatlab: Use pre-built libraries for MinGW if needed
| * FindMatlab: Use pre-built libraries for MinGW if neededSebastian Niemann2016-08-151-1/+5
| |
* | Merge topic 'issue-tracker-urls'Brad King2016-08-166-8/+9
|\ \ | | | | | | | | | | | | 2bdba83e issues: update references to the CMake issue tracker
| * | issues: update references to the CMake issue trackerBen Boeckel2016-08-156-8/+9
| |/ | | | | | | | | References to specific comments are left as-is since comments were not migrated.
* | Merge topic 'FindCUDA-fixes'Brad King2016-08-151-9/+11
|\ \ | | | | | | | | | | | | | | | 1aa5c1be FindCUDA: Fix missing librt on Linux when using static cuda runtime. aab1f6e9 FindCUDA: Restore default behavior of CUDA_USE_STATIC_CUDA_RUNTIME
| * | FindCUDA: Fix missing librt on Linux when using static cuda runtime.Stephen Sorley2016-08-121-6/+7
| | | | | | | | | | | | | | | | | | Commit 7229ae72 (FindCUDA: Refactor Android(Tegra) support, 2016-04-19) changed the logic to only add librt to the link line for CUDA versions 6.5 and older. However, newer versions of CUDA still require librt.
| * | FindCUDA: Restore default behavior of CUDA_USE_STATIC_CUDA_RUNTIMEStephen Sorley2016-08-121-3/+4
| |/ | | | | | | | | | | | | Fix bug introduced by commit 7229ae72 (FindCUDA: Refactor Android(Tegra) support, 2016-04-19). `CUDA_USE_STATIC_CUDA_RUNTIME` should be enabled by default if `cudart_static` is available, and silently disabled if it is not.
* | Merge topic 'GetPrerequisites-fix-regression'Brad King2016-08-151-2/+6
|\ \ | |/ |/| | | | | a2d5c25a GetPrerequisites: Fix regression in gp_resolved_file_type
| * GetPrerequisites: Fix regression in gp_resolved_file_typeBrad King2016-08-121-2/+6
| | | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~287^2 (GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths, 2016-03-08) we accidentally convert relative paths (e.g. system dll file names) to absolute paths even when we do not know the base directory. Fix this by canonicalizing only paths that are already absolute. Closes: #16240
* | Merge topic '15687-xcode-support-system-include'Brad King2016-08-101-0/+1
|\ \ | | | | | | | | | | | | 93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)
| * | Xcode: Obey SYSTEM keyword for includes (#15687)Gregor Jasny2016-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | NAG: Use -PIC for Fortran position-independent executable codeNeil Carlson2016-08-091-0/+1
|/ / | | | | | | | | | | | | | | | | The Numerical Algorithms Group (NAG) Fortran compiler documents -PIC for position-independent code and does not have a separate option for PIE. We added `-PIC` for PIC in commit v2.8.11~174^2 (NAG: Use -PIC for Fortran position-independent code, 2013-02-18). Follow up for PIE. Closes: #16236
* | Merge topic 'fix-string-append'Brad King2016-08-095-5/+5
|\ \ | | | | | | | | | | | | | | | 551b4c90 Revert the use of string(APPEND) in .cmake.in files 3a7be4f3 prefer list(APPEND) over string(APPEND) where appropriate
| * | Revert the use of string(APPEND) in .cmake.in filesDaniel Pfeifer2016-08-083-3/+3
| | | | | | | | | | | | | | | The generated files may be consumed by older cmake versions which do not support string(APPEND).
| * | prefer list(APPEND) over string(APPEND) where appropriateDaniel Pfeifer2016-08-082-2/+2
| | |
* | | Merge topic 'GetPrerequisites-grep-a'Brad King2016-08-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 5f3c8f6a GetPrerequisites: Always filter objdump output as text
| * | | GetPrerequisites: Always filter objdump output as textAlexander Shishenko2016-08-081-1/+1
| |/ / | | | | | | | | | | | | | | | When using `grep` to filter the output, add the `-a` flag to tell it never to treat the output as binary. Otherwise when LANG != C in the environment the non-ascii text may break the filter.
* | | Merge topic 'wix-custom-install-dir'Brad King2016-08-091-0/+17
|\ \ \ | |/ / |/| | | | | | | | 17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature
| * | CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER featureMichael Stürmer2016-08-081-0/+17
| | | | | | | | | | | | | | | The new variable allows setting of a custom absolute installation prefix outside of the ProgramFiles folders.
* | | Merge topic 'update-cle-version-info'Brad King2016-08-082-4/+14
|\ \ \ | | | | | | | | | | | | | | | | e52302d6 CrayLinuxEnvironment: Add alternative methods to get version info
| * | | CrayLinuxEnvironment: Add alternative methods to get version infoChuck Atkins2016-08-052-4/+14
| | |/ | |/| | | | | | | Closes: #16229
* | | FindOpenCL: Fix search on macOS.Matthäus G. Chajdas2016-08-081-3/+10
| |/ |/| | | | | The original patch was provided by jerry <jerry.c.t@web.de>.
* | Modules: Make imported targets fall back to `Release`Brad King2016-08-037-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | Find modules only detect Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091. This approach is recommended by documentation in `cmake-developer(7)` added by commit v3.2.0-rc1~286^2~1 (Help: Document IMPORTED_CONFIGURATIONS target property for Find modules, 2014-12-04).
* | Merge topic 'CMakeFindFrameworks-custom-locations'Brad King2016-08-031-1/+7
|\ \ | | | | | | | | | | | | 9970cdcb CMakeFindFrameworks: Allow custom framework locations
| * | CMakeFindFrameworks: Allow custom framework locationsDavid Keller2016-08-021-1/+7
| | | | | | | | | | | | | | | | | | | | | Read a variable to get non-standard locations to be searched, e.g. brew, port. Signed-off-by: David Keller <david.keller@litchis.fr>
* | | Merge topic 'gcc-fvisibility-version'Brad King2016-08-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 85e03142 GNU: Use -fvisibility on GCC 4.0 and 4.1 too
| * | | GNU: Use -fvisibility on GCC 4.0 and 4.1 tooBrad King2016-08-021-1/+1
| |/ / | | | | | | | | | | | | | | | | | | This flag is needed for the `<LANG>_VISIBILITY_PRESET` target property. It has been supported since GCC 4.0, not 4.2 as we previously recorded. Fixes #16222.
* | | Merge topic 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS'Brad King2016-08-031-0/+8
|\ \ \ | | | | | | | | | | | | | | | | 5790d9b6 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
| * | | FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRSKonstantin Sinitsyn2016-08-021-0/+8
| | |/ | |/| | | | | | | | | | | | | Support was accidentally dropped by commit v3.6.0-rc1~273^2 (FindProtobuf: Rename variables to match case of module name, 2016-03-01).
* | | Merge topic 'port-to-sco'Brad King2016-08-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | 56539d89 SCO_SV: Enable so filename versioning 16a3a735 cmELF: Port to SCO OpenServer 5.0.7/3.2
| * | | SCO_SV: Enable so filename versioningPatrick Welche2016-08-021-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Take changes used by pkgsrc [1]: * so filename versioning requires CMAKE_SHARED_LIBRARY_SONAME_C_FLAG. [1] http://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/cmake/patches/
* | | Merge topic 'ExternalProject-no-DS_Store'Brad King2016-08-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 52aecc0c ExternalProject: Ignore macOS .DS_Store files in tarball extraction
| * | | ExternalProject: Ignore macOS .DS_Store files in tarball extractionBrad King2016-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not consider a top-level `.DS_Store` file when deciding whether a tarball contains exactly one directory whose contents should be used as the resulting top-level of the extraction. Fixes #16218. Suggested-by: Patrice Kouame
* | | | Merge topic 'wix-root-description'Brad King2016-08-031-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e29bfbf2 CPackWIX: Support custom title and description for the root feature
| * | | | CPackWIX: Support custom title and description for the root featureMichael Stürmer2016-08-021-0/+11
| | |/ / | |/| | | | | | | | | | | | | | | | | | These can now be specified through the WIX generator specific CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and CPACK_WIX_ROOT_FEATURE_DESCRIPTION.
* | | | Merge topic 'FindCUDA-no-windows-librt'Brad King2016-08-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f4e979b1 FindCUDA: Do not look for librt on Windows
| * | | | FindCUDA: Do not look for librt on WindowsStephen Sorley2016-08-021-1/+1
| |/ / / | | | | | | | | | | | | | | | | Otherwise an incorrect warning appears when compiling with CUDA SDK 6.5 or older and CUDA_USE_STATIC_CUDA_RUNTIME is true.
* | | | Merge topic 'FindCUDA-arch'Brad King2016-08-031-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 15a6ae5c FindCUDA: Add search path for nvcc on Arch
| * | | | FindCUDA: Add search path for nvcc on ArchHans Gaiser2016-08-021-1/+2
| |/ / /
* | | | Merge topic 'intel-gnu11-support'Brad King2016-08-031-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 088f14eb Intel-C: standard flags are also supported in 12.0 27a3ca15 Intel-C: support gnu89 and gnu99 extension flags cc223e1e Intel-C: declare support for gnu11
| * | | | Intel-C: standard flags are also supported in 12.0Ben Boeckel2016-08-021-1/+1
| | | | |
| * | | | Intel-C: support gnu89 and gnu99 extension flagsBen Boeckel2016-08-021-2/+2
| | | | |
| * | | | Intel-C: declare support for gnu11Ben Boeckel2016-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without extensions, functions like `strdup` are not available since they are actually controlled by feature flags such as _SVID_SOURCE and _BSD_SOURCE. When using `-std=c11` on Intel, none of these flags are set, so the functions are not declared properly leading to compile errors. Reported-by: Adam J. Stewart <ajstewart426@gmail.com> Closes: #16226
* | | | | Merge topic 'fix-findhdf5-definitions'Brad King2016-08-031-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | 8eb0b56c FindHDF5: Make sure compile definition vars keep the -D flag
| * | | | FindHDF5: Make sure compile definition vars keep the -D flagChuck Atkins2016-08-021-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'nsis-protect-uninst-exec' into releaseBrad King2016-07-211-1/+1
| |\ \ \
| * \ \ \ Merge branch 'FindHDF5-fix-misc-issues' into releaseBrad King2016-07-131-37/+99
| |\ \ \ \
* | \ \ \ \ Merge topic 'wix-disabled-components'Brad King2016-08-011-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED 6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables
| * | | | | | CPackComponent: Document the *_HIDDEN and *_DISABLED variablesNils Gladitz2016-07-221-1/+9
| | | | | | |
* | | | | | | Use string(APPEND) in ModulesDaniel Pfeifer2016-07-2758-240/+240
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automate with: find Modules -type f -print0 | xargs -0 perl -i -0pe \ 's/set\(([a-zA-Z0-9_]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'