summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Merge topic 'SunPro-no-KPIE'Brad King2015-03-242-2/+0
|\ | | | | | | | | 209c142f SunPro: Drop non-existent -KPIE flag
| * SunPro: Drop non-existent -KPIE flagSteven Vancoillie2015-03-232-2/+0
| |
* | Merge topic 'blugeneq-platform-files'Brad King2015-03-2415-0/+403
|\ \ | | | | | | | | | | | | 13807bcb BlueGene/Q Platform files
| * | BlueGene/Q Platform filesTodd Gamblin2015-03-1915-0/+403
| | | | | | | | | | | | | | | - based on the BlueGene/P platform files. - tested by Todd Gamblin (LLNL) and David DeMarle (Kitware)
* | | OS X: Look for Xcode 5 platform-specific FrameworksGregor Jasny2015-03-241-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 5 platform specific framework locations differ from the Xcode 6 ones. Look first for the Xcode 6 ones, then for iOS Xcode 5 ones and last for the Xcode 5 OS X ones. For reference, the XCTest.framework is located as follows: Xcode511.app/Contents/Developer/Library/Frameworks/XCTest.framework Xcode511.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/Developer/Library/Frameworks/XCTest.framework Xcode511.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.1.sdk/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework Xcode601.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks/XCTest.framework Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | Merge topic 'lib64_paths_crosscompiling'Brad King2015-03-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 81bfebfe Linux: Ignore Debian-specific case when cross-compiling
| * | | Linux: Ignore Debian-specific case when cross-compilingZack Galbreath2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | When constructing settings for the target environment during cross compiling we should not check for /etc/debian_version on the host.
* | | | Merge topic 'UseJava-fix-arg-parse'Brad King2015-03-231-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a21e8df0 UseJava: Fix add_jar argument parsing (#14655)
| * | | | UseJava: Fix add_jar argument parsing (#14655)Mark Studenka2015-03-201-11/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~63^2 (UseJava.cmake: require explicit request to include jars, 2013-03-26) the argument parsing always overrides the variable settings even if the corresponding arguments are not passed. Re-order logic to fix this.
* | | | Merge topic 'cpack-bundle-codesign'Brad King2015-03-231-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fb3e4de8 CPack: Add support to overwrite or pass additional parameter to codesign
| * | | | CPack: Add support to overwrite or pass additional parameter to codesignAndré Klitzing2015-03-231-0/+5
| | |/ / | |/| |
* | | | Merge topic 'cpack-rpm-ignore-default-prefix'Brad King2015-03-231-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 18917d66 CPack/RPM ignore install prefix relocation path
| * | | | CPack/RPM ignore install prefix relocation pathDomen Vrankar2015-03-201-2/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Patch adds possibility to remove CPACK_PACKAGING_INSTALL_PREFIX from the list of relocation paths when crating a relocatable rpm.
* | | | Merge topic 'SunPro-Fortran-KPIC'Brad King2015-03-231-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 3556fb1b SunPro: Add position independent code flag for Fortran compiler
| * | | SunPro: Add position independent code flag for Fortran compilerSteven Vancoillie2015-03-201-0/+1
| |/ /
* | | Merge topic 'pgi-no-pie'Brad King2015-03-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 00842df4 PGI: Remove invalid -fPIE flag (#15460)
| * | | PGI: Remove invalid -fPIE flag (#15460)Brad King2015-03-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | The PGI compilers on Linux do not have the -fPIE flag. Remove the table entry added by commit v2.8.9~125^2~2 (Add platform variables for position independent code flags, 2012-05-05), which likely included it only as part of a sweeping introduction of such flags.
* | | Merge topic 'xcode-xctest'Brad King2015-03-231-0/+196
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 4178cd88 Help: Add notes for topic 'xcode-xctest' 87a4b858 Tests: Add XCTest example to test Frameworks and Cocoa App Bundles ba14510b OS X: Add FindXCTest module 3714955b OS X: Add handling for XCTest bundles 54a5cdbb Tests: Compute Xcode version for any generator on OS X
| * | OS X: Add FindXCTest moduleGregor Jasny2015-03-231-0/+196
| |/ | | | | | | | | | | | | Add a module to lookup XCTest Framework and xctest utility. It also provides APIs for creating 'xctest' targets. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | Merge topic 'fix-FindPackageHandleStandardArgs-doc'Brad King2015-03-201-1/+1
|\ \ | | | | | | | | | | | | 39451413 FPHSA: Revise documented command signature
| * | FPHSA: Revise documented command signatureGregor Jasny2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | For mode 2 the first argument is not the literal NAME but the package name. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | Merge topic 'cpack_rpm_component_fall_through'Brad King2015-03-201-652/+621
|\ \ \ | | | | | | | | | | | | | | | | | | | | be089724 CPack/RPM prevent component attributes leakage ffc1b945 CPack/RPM improved component override test
| * | | CPack/RPM prevent component attributes leakageDomen Vrankar2015-03-171-652/+621
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mantis bug report with id 15169. Some component specific attributes were leaking to next component. Leakage handling was implemented in different locations but there were still attributes that leaked. Patch encapsulates generator into function so all current leaks are fixed and no future leaks can occur.
* | | Merge topic 'WCDH-fix-cxx_nullptr-workaround'Brad King2015-03-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | f9d09626 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
| * | | WCDH: Fix cxx_nullptr workaround for pre-C++11 compilersRoman Wüger2015-03-171-1/+1
| |/ / | | | | | | | | | | | | Use just '0' instead of 'static_cast<void*>(0)' because the latter will not automatically convert to pointers to other types.
* | | Record compile features for GNU on Windows (#15443)Brad King2015-03-171-2/+2
|/ / | | | | | | | | | | Drop the 'UNIX' condition on GNU compiler features. Suggested-by: David Demelier <demelier.david@gmail.com>
* | FindMatlab: Rewrite module and provide a usage APIRaffi Enficiaud2015-03-172-87/+1513
|/ | | | | | | | | | | Implement a brand new FindMatlab module: - Add support for versions and components. - Find Matlab and its version in a more precise and multiplatform way. - Add API to create a new mex extension with documentation. - Add API to add matlab unit tests (with or without the unit test framework). - Find as much as possible based on a single Matlab_ROOT_DIR cache entry and allow the user to change it to re-find everything.
* Merge topic 'ExternalProject-byproducts-tokens'Brad King2015-03-101-3/+3
|\ | | | | | | | | 86032ae0 ExternalProject: Replace placeholder tokens in BYPRODUCTS
| * ExternalProject: Replace placeholder tokens in BYPRODUCTSGaëtan Lehmann2015-03-091-3/+3
| | | | | | | | | | | | This allows the developer to specify the byproducts relative to the binary directory without the need to set the binary directory location explicitly.
* | Merge topic 'UseSWIG-fix-CMP0054-warnings'Brad King2015-03-101-4/+4
|\ \ | |/ |/| | | | | 458c9e95 UseSWIG: Avoid if() auto-dereferene in quoted arguments
| * UseSWIG: Avoid if() auto-dereferene in quoted argumentsBrad King2015-03-091-4/+4
| | | | | | | | | | | | | | Protect against variables named "CSHARP", "PERL", "PYTHON", or "UNKNOWN" when CMP0054 is not set to NEW. Reported-by: Tuukka Pasanen <tuukka@iocaste.ilmi.fi>
* | CPackWIX: Support patching of root <Feature> elements.Nils Gladitz2015-03-061-2/+4
| |
* | InstallRequiredSystemLibraries: Add option to specify install COMPONENTJohan Andruejol2015-03-031-2/+12
| | | | | | | | | | | | | | | | Previously the module did not support projects using installation components because install(PROGRAMS) was never called with COMPONENT. Add an option to specify the COMPONENT so that projects doing this do not have to resort to using CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP and writing the install rule by hand.
* | InstallRequiredSystemLibraries: Format documentationBrad King2015-03-031-25/+34
| |
* | CPack: be more stringent when selecting variables to encodeРоман Донченко2015-03-021-1/+1
| | | | | | | | The old version would admit, for example, a variable named "xxxCPACK".
* | Merge topic 'locale-agnostic-findhg'Brad King2015-03-021-0/+10
|\ \ | | | | | | | | | | | | cfb22354 FindHg: Run hg with C locale when querying its version.
| * | FindHg: Run hg with C locale when querying its version.Nils Gladitz2015-02-281-0/+10
| | | | | | | | | | | | | | | LANGUAGE should be ignored when LC_ALL=C. It seems this isn't the case with hg so set both.
* | | Merge topic 'modules-check-ARGC'Brad King2015-03-028-39/+121
|\ \ \ | |/ / |/| | | | | | | | a7631fc4 Modules: Check for ARGC before using ARGV#
| * | Modules: Check for ARGC before using ARGV#Daniele E. Domenichelli2015-02-278-39/+121
| | | | | | | | | | | | ARGV# could be defined from a parent scope.
* | | Merge branch 'cpack_rpm_mulit_prefix_fixup' into ↵Domen Vrankar2015-02-271-17/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cpack_rpm_mulit_prefix_fixup-for-master Resolve conflict in Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake by combining the changes from both sides.
| * | | CPackRPM: Fix handling of relocation prefix parent directoriesDomen Vrankar2015-02-271-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes for one package, 2015-01-21) a regression was introduced that causes parent directories of relocation paths to be incorrectly included in the rpm. Fix this and make the test case more strict to cover it.
* | | | Merge topic 'windows-rc-enable-later'Brad King2015-02-264-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 772eae44 RC: Add platform-specific preprocessor definitions (#15404) 4300de3e RC: Enable language after C, CXX, or Fortran is enabled (#15404) 1de4a0fb RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting
| * | | | RC: Add platform-specific preprocessor definitions (#15404)Brad King2015-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Platform/Windows-MSVC the C and CXX flags are initialized to contain preprocessor definitions describing the platform. On WinCE platforms this may not be just -DWIN32. This information may be important to RC sources too, so add such preprocessor definitions to the default RC flags. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
| * | | | RC: Enable language after C, CXX, or Fortran is enabled (#15404)Brad King2015-02-253-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RC language is special in that it is automatically enabled on Windows-based platforms when another primary language is enabled. Move enablement of RC from early in the enablement of the other language to late. This will allow it to use information detected as part of enabling C, CXX, or Fortran.
| * | | | RC: Drop unused CMAKE_COMPILE_RESOURCE variable settingBrad King2015-02-252-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This variable has long been replaced by CMAKE_RC_COMPILE_OBJECT. Stop setting it in platform modules.
* | | | | Merge topic 'ExternalData-url-algo-map'Brad King2015-02-261-1/+40
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | f7f4ca55 ExternalData: Add support for custom algorithm-to-URL mapping
| * | | | ExternalData: Add support for custom algorithm-to-URL mappingBrad King2015-02-251-1/+40
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow URL templates to contain a %(algo:<key>) placeholder that is replaced by mapping the canonical hash algorithm name through a map defined by the <key>. Extend the Module.ExternalData test to cover the behavior. Extend the RunCMake.ExternalData test to cover error cases.
* | | | Merge topic 'CheckCompilerFlag-use-FLAGS'Brad King2015-02-253-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5d5067ae Check*CompilerFlag: Refactor method used to pass flags
| * | | | Check*CompilerFlag: Refactor method used to pass flagsMark Abraham2015-02-243-12/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Refactor the Check*CompilerFlag modules to pass the flags to Check*SourceCompiles using CMAKE_REQUIRED_FLAGS instead of CMAKE_REQUIRED_DEFINITIONS. Both end up being used, but the variable for "FLAGS" is more precise.