summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindBLAS: Fix pattern matching on BLAS vendor nameBrad King2016-01-081-6/+6
| | | | | | | The if(STREQUAL) expressions do not support globbing expressions. Use regular experssions with MATCHES instead. Reported-by: Yahui Wang <youngqv@foxmail.com>
* Merge topic 'cray-prgev-cleanup'Brad King2016-01-071-2/+5
|\ | | | | | | | | 64e26850 CrayPrgEnv: Cleanup binaries from implicit compile flag detection
| * CrayPrgEnv: Cleanup binaries from implicit compile flag detectionChuck Atkins2015-12-291-2/+5
| |
* | Merge topic 'vs-compiler-id-itanium'Brad King2016-01-071-3/+0
|\ \ | |/ |/| | | | | d9bf5206 CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)
| * CMakeDetermineCompilerId: Fix VS Itanium platform name (#15889)Brad King2015-12-211-3/+0
| | | | | | | | | | | | | | VS expects the platform to be just `Itanium`, so drop the incorrect special case mapping it to `ia64`. This platform name has been wrong since the logic was added by commit v2.8.10~148^2~8 (VS: Detect the compiler id and tool location, 2012-08-16).
* | Merge topic 'fix-absolute-libs-for-cray-wrappers'Brad King2015-12-211-6/+11
|\ \ | | | | | | | | | | | | 928d2085 CrayPrgEnv: Don't use absolute paths for imlicit libraries
| * | CrayPrgEnv: Don't use absolute paths for imlicit librariesChuck Atkins2015-12-181-6/+11
| | | | | | | | | | | | | | | | | | | | | When parsing implicit include dirs, link dirs, and link libs, all arguments are resolved to absolute paths instead of relative paths. This is correct for link and include directories but link libraries should only include the library name, not it's path.
* | | Merge topic 'release-wix-config-ng'Brad King2015-12-181-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 24cdb9df CMake: Mimic NSIS options dialog in WiX installer de77d4a7 CPackWIX: Allow multiple patch files and diagnose if any are missing 38d723b3 CPackWIX: Allow patching of shortcut components
| * | | CPackWIX: Allow multiple patch files and diagnose if any are missingNils Gladitz2015-12-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_WIX_PATCH_FILE now accepts a list of patch files. An error will now be produced if any of the patch files is missing. Previously this would be silently ignored.
* | | | Merge topic 'boost-1.60'Brad King2015-12-181-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0a31fdab FindBoost: Add support for Boost 1.60
| * | | | FindBoost: Add support for Boost 1.60Roger Leigh2015-12-171-1/+15
| | |/ / | |/| |
* | | | Merge topic 'BundleUtilities-fix-osx-rpath'Brad King2015-12-181-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a479d7a0 BundleUtilities: Fix handling of multiple RPATHs from OS X otool
| * | | | BundleUtilities: Fix handling of multiple RPATHs from OS X otoolEmilie Harquel2015-12-171-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | The `otool` command may return multiple RPATH entires, so call `gp_append_unique` for each one. Otherwise we may try to ask `install_name_tool` to deal with the same entry twice.
* | | | CMakeParseArguments: replace by native cmake_parse_arguments commandMatthias Maennich2015-12-171-144/+4
|/ / / | | | | | | | | | | | | | | | | | | Implement a native `cmake_parse_arguments` command that is fully compatible with the documented behaviour of the previous implementation. Leave the CMakeParseArguments module empty but existing for compatibility.
* | | Merge topic 'FindOpenGL-no-osx-AGL'Brad King2015-12-171-4/+8
|\ \ \ | | | | | | | | | | | | | | | | 08580be2 FindOpenGL: Don't add AGL to OPENGL_LIBRARIES on OS X.
| * | | FindOpenGL: Don't add AGL to OPENGL_LIBRARIES on OS X.David Gobbi2015-12-141-4/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake had been setting OPENGL_glu_LIBRARY to AGL.framework, even though AGL is not GLU. AGL is simply the GL component for the deprecated Carbon framework. GLU is provided by OpenGL.framework. A side effect of the old behavior was that if AGL was not found (it is absent from OS X SDK 10.10 or later), then OPENGL_GLU_FOUND would be incorrectly set to "NO".
* | | Merge topic 'FindProtobuf-fix-case'Brad King2015-12-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 2908103d FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUND
| * | | FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUNDSebastian Schuberth2015-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All other modules use their module name (e.g. XxX for FindXxX.cmake) in find_package_handle_standard_args. Protobuf used all-caps, which triggers a bug when we try to find Protobuf with the CMakeFindDependencyMacro.cmake macro, which only checks for the mixed-case _FOUND.
* | | | Merge topic 'FindGTest-imported-targets'Brad King2015-12-141-52/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0b5ce7f Help: Add notes for topic 'FindGTest-imported-targets' 99afe235 Tests: Add tests for FindGTest 611735e7 FindGTest: Add imported targets and update documentation
| * | | | FindGTest: Add imported targets and update documentationRoger Leigh2015-12-101-52/+108
| |/ / /
* | | | Merge topic 'fix-CMP0065-NEW-AIX-HP'Brad King2015-12-144-4/+28
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | f254276f AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEW
| * | | AIX,HP-UX: Fix RPATH handling when CMP0065 is set to NEWMarc Chevrier2015-12-114-4/+28
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS setting has always been meant for flags needed to export symbols from executables for use by shared library plugins. Since commit v3.4.0-rc1~58^2~1 (CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS, 2015-08-24) this is made explicit by using the flags only for executables with ENABLE_EXPORTS, guarded by CMP0065 for compatibility. On some platforms we were accidentally using this setting to pass other flags to the linker: * AIX: -bnoipath, -brtl * HP-UX: +s, +nodefaultrpath These flags are incorrectly dropped when CMP0065 is set to NEW. Fix this by moving the flags to more appropriate places for linking executables.
* | | Merge topic 'ios-universal'Brad King2015-12-111-0/+297
|\ \ \ | | | | | | | | | | | | | | | | | | | | 565d080a Xcode: Add support for combined install on iOS 34f5ef56 iOS: Fix App Bundle layout
| * | | Xcode: Add support for combined install on iOSRuslan Baratov2015-12-101-0/+297
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch solves the problem of installing both: Device and Simulator libraries on iOS. Before only one of them was installed. If the IOS_INSTALL_COMBINED property is set on a target, a special install hook will be activated which builds the corresponding target and combines both at the install location. The original patch was contributed by Ruslan Baratov, and polished by Gregor Jasny.
* | | Merge topic 'FindOpenMP-clang'Brad King2015-12-111-0/+3
|\ \ \ | | | | | | | | | | | | | | | | 1549927d FindOpenMP: Add Clang support
| * | | FindOpenMP: Add Clang supportChris Pavlina2015-12-101-0/+3
| |/ /
* | | FindOpenAL: Detect Windows architecture-specific installationBrad King2015-12-101-1/+8
|/ / | | | | | | | | | | | | Some OpenAL implementations on Windows provide both Win32 and Win64 binaries. Search the location of the matching architecture. Author: George "Zogzer@GitHub" <insertlogic@gmail.com>
* | Merge topic 'detect-cray-wrappers'Brad King2015-12-0929-182/+351
|\ \ | | | | | | | | | | | | | | | | | | a7ef0225 Cray: Refactor the Cray platform files to use compiler wrapper checks 0763a836 Cray: Add macro tests to detect the Cray compiler wrappers 5eaac0c9 Compiler: Add infrastructure for detecting compiler wrappers
| * | Cray: Refactor the Cray platform files to use compiler wrapper checksChuck Atkins2015-12-0918-182/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an extensive refactoring of the Cray compiler wrapper usage. Using the new compiler wrapper checks, the CrayPrgEnv info files have been moved from Platform/ to Compiler/. The adjusted naming convention allows the compiler-wrapper information files to be loaded for both the CrayLinuxEnvironment platform when cross-compiling and the Linux platform if building natively on the Cray compute nodes. It also creates a separation of common arguments for compiler id and language information used to perform the appropriate introspection of implicit arguments and libraries used by the compiler wrappers based on the loaded module environment.
| * | Cray: Add macro tests to detect the Cray compiler wrappersChuck Atkins2015-12-073-0/+17
| | |
| * | Compiler: Add infrastructure for detecting compiler wrappersChuck Atkins2015-12-078-0/+70
| | |
* | | CPackRPM: Configure RPM package group and name per componentMarkus Rickert2015-12-071-11/+28
| | |
* | | Merge topic 'FindTIFF-imported-targets'Brad King2015-12-071-10/+57
|\ \ \ | | | | | | | | | | | | | | | | ebaca629 FindTIFF: Add imported targets and update documentation
| * | | FindTIFF: Add imported targets and update documentationRoger Leigh2015-12-071-10/+57
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add TIFF::TIFF imported target - Document imported target - Add testcase to test the standard variables and the imported target Also: - Add TIFF_INCLUDE_DIRS to match common practice - Update documentation generally, including documenting TIFF_INCLUDE_DIRS
* | | Merge topic 'find-ftn-by-default'Brad King2015-12-071-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 71e5f253 Fortran: Add ftn, the Cray compiler wrapper, to the default search.
| * | | Fortran: Add ftn, the Cray compiler wrapper, to the default search.Chuck Atkins2015-12-041-0/+2
| |/ /
* | | Merge topic 'FindJNI-aix'Brad King2015-12-071-2/+4
|\ \ \ | | | | | | | | | | | | | | | | 4d4fcabd FindJNI: Add support for AIX java sdk
| * | | FindJNI: Add support for AIX java sdkMarc Chevrier2015-12-041-2/+4
| |/ /
* | | Merge topic 'UseJava-relative-manifest'Brad King2015-12-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 56c11eee UseJava: Allow relative path to manifest file just as with other sources
| * | | UseJava: Allow relative path to manifest file just as with other sourcesMarc Chevrier2015-12-031-1/+1
| |/ /
* | | Merge topic 'fix-java-idlj-jarsigner-typos'Brad King2015-12-071-3/+3
|\ \ \ | | | | | | | | | | | | | | | | d8b251e2 FindJava: Fix typos in IdlJ and JarSigner component implementation
| * | | FindJava: Fix typos in IdlJ and JarSigner component implementationMarc Chevrier2015-12-031-3/+3
| | |/ | |/| | | | | | | | | | | | | Fix typos introduced by commit v3.4.0-rc1~257^2~2 (FindJava: Add support for idlj and jarsigner tools, 2015-07-31) to correctly report when these components are found.
| * | Merge branch 'revert-compiler-links-statically' into releaseBrad King2015-11-237-23/+0
| |\ \
| * \ \ Merge branch 'fix-forced-toolchain-dialect' into releaseBrad King2015-11-197-0/+29
| |\ \ \
| * \ \ \ Merge branch 'FindGTest-avoid-CMP0064' into releaseBrad King2015-11-181-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'fix-compute-default-dialect-lto' into releaseBrad King2015-11-182-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cray-fortran-version' into releaseBrad King2015-11-121-0/+2
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'improve-embarcadero'Brad King2015-12-043-2/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a327727 Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__. 25211d75 Compiler ID: Compiler versions must be a valid, numeric version string. 060442c2 Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID. f3b3219c Embarcadero/Watcom: Properly skip VSResource test for other generators. ddbda722 Embarcadero: Fix bug where duplicate Ninja job pools would be created.
| * | | | | | | | Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__.James Johnston2015-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the following link: http://docwiki.embarcadero.com/RADStudio/Seattle/en/Example_of_CODEGEARC_VERSION_Macro The major/minor versions must be decoded as a hex string, while the patch version must be decoded as a normal decimal string. As an example, C++ Builder XE 8.1's bcc32.exe sets this macro to 0x070189C9. The file version of bcc32.exe is 7.1.5570.35273. Therefore, the correct interpretation to COMPILER_VERSION would be 7.1.35273.
| * | | | | | | | Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID.James Johnston2015-12-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID variables are set to "Borland" for older versions of the compiler. Newer CodeGear/Embarcadero compilers will have those variables set to "Embarcadero". Search for lines of code referencing both the variable name and Borland to be sure that they also refer to Embarcadero.