summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | | Embarcadero: Fix bug where duplicate Ninja job pools would be created.James Johnston2015-12-031-1/+5
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the platform file was included multiple times, it was possible that duplicate Ninja job pools would be created.
* | | | | | | | FindBoost: Add imported targetsRoger Leigh2015-12-021-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Targets include: - Boost::boost: Target for header-only dependencies - Boost::<C>: Target for specific component dependency - Boost::diagnostic_definitions: adds BOOST_LIB_DIAGNOSTIC - Boost::disable_autolinking: adds BOOST_ALL_NO_LIB - Boost::dynamic_linking: adds BOOST_ALL_DYN_LINK
* | | | | | | | FindBoost: Automatically add missing component dependenciesRoger Leigh2015-12-021-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function _Boost_MISSING_DEPENDENCIES will look at the user-supplied component list, check the dependency information for each component using _Boost_COMPONENT_DEPENDENCIES, and will add any missing dependencies to the component list. This ensures that all required components will be searched for.
* | | | | | | | FindBoost: Embed component dependency tableRoger Leigh2015-12-021-0/+221
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function _Boost_COMPONENT_DEPENDENCIES is used to query the library dependencies for a given component for a given version of Boost. This covers Boost releases from 1.33 to 1.59, using the information generated by Utilities/Scripts/BoostScanDeps.cmake.
* | | | | | | CPack/DragNDrop: Allow single license for multiple languagesSimon Levermann2015-12-021-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When both CPACK_DMG_SLA_DIR and CPACK_RESOURCE_FILE_LICENSE are defined, use the license file for all languages instead of looking for a license file for each language. Also expand the documentation on the SLA variables.
* | | | | | | Merge topic 'FindCUDA-aarch64'Brad King2015-11-241-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae1003cd FindCUDA: Add paths for crosscompiling to aarch64
| * | | | | | | FindCUDA: Add paths for crosscompiling to aarch64Alexander Szakaly2015-11-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Choose a CUDA_TOOLKIT_TARGET_DIR for the aarch64 architecture automatically.
* | | | | | | | Merge topic 'FindXercesC-imported-targets'Brad King2015-11-241-10/+57
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dcc833b FindXercesC: Add imported targets and unit test
| * | | | | | | | FindXercesC: Add imported targets and unit testRoger Leigh2015-11-231-10/+57
| | | | | | | | |
* | | | | | | | | Merge topic 'revert-compiler-links-statically'Brad King2015-11-247-23/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | 9682de56 Revert "Disable shared library support when compiler links statically" (#15855)
| * | | | | | | Revert "Disable shared library support when compiler links statically" (#15855)Brad King2015-11-237-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~18^2 (Disable shared library support when compiler links statically, 2015-09-30) we tried to detect when the compiler is not capable of linking shared libraries (possibly due to flags in use). However, the approach is not robust against flags like `-nostdlib`. Revert it for now pending another solution to the original problem.
* | | | | | | | Merge topic 'fix-forced-toolchain-dialect'Brad King2015-11-207-0/+29
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | 441dba80 Project: Guess default standard dialect if compiler was forced (#15852)
| * | | | | | Project: Guess default standard dialect if compiler was forced (#15852)Brad King2015-11-197-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we always guessed the default language standard dialect based on the compiler version. This was not reliable so that commit switched to computing the default language standard dialect while detecting the compiler id. When a toolchain file uses CMakeForceCompiler to set the compiler id then the detection does not occur. Therefore commit v3.4.0-rc1~54^2 (Project: Don't require computed default dialect if compiler was forced, 2015-09-22) made the lack of detection an error only if the compiler was not forced. However, this means that projects using CMakeForceCompiler no longer even get the guess that we had before so <LANG>_COMPILER does not work. Due to the sophistication of CMake's compiler detection logic projects should be ported away from using CMakeForceCompiler. In the meantime, restore a guess of the default language standard dialect when the compiler is forced.
* | | | | | | Merge topic 'add-cray-linux-platform'Brad King2015-11-191-66/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 743fcf1e Cray: Fix static / dynamic detection logic and parse more driver flags
| * | | | | | | Cray: Fix static / dynamic detection logic and parse more driver flagsChuck Atkins2015-11-181-66/+88
| | | | | | | |
* | | | | | | | Merge topic 'FindGTest-avoid-CMP0064'Brad King2015-11-191-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | b5e7b22d FindGTest: Refactor test type checks to avoid cases triggering CMP0064
| * | | | | | | FindGTest: Refactor test type checks to avoid cases triggering CMP0064Brad King2015-11-181-3/+3
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our if() conditions to avoid CMP0064 warnings when `${test_type}` is equal to `TEST`. Reported-by: David T. Chen <dchen@mail.nih.gov>
* | | | | | | Merge topic 'fix-compute-default-dialect-lto'Brad King2015-11-182-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | c3dc8935 Make C and C++ default dialect detection robust to advanced optimizations
| * | | | | | Make C and C++ default dialect detection robust to advanced optimizationsBrad King2015-11-182-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.4.0-rc1~71^2 (Project: Determine default language dialect for the compiler, 2015-09-15) we added an "INFO:..." string to the compiler id detection binary. The value can be optimized out of the compiler id binary unless we force it to be included by making the program behavior depend on it at runtime. Add references to the value as we do for the other info strings already. Gentoo-Issue: https://bugs.gentoo.org/show_bug.cgi?id=565744
| * | | | | Merge branch 'intel-fortran-2016' into releaseBrad King2015-10-291-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ExternalProject-fix-git-version' into releaseBrad King2015-10-151-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'xcode-adjust-deployment-to-host-version' into releaseBrad King2015-10-121-0/+4
| |\ \ \ \ \ \ \