summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* GetPrerequisites: Update output matching for newer 'file' versionsMarcus Meissner2015-02-231-0/+7
| | | | | | | | | | | | | Detect PIE binaries with newer 'file' (5.22). It no longer prints "(uses shared libraries)" but does print "interpreter": # file 5.19 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked (uses shared libs), ... # file 5.22 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, ...
* Merge branch 'FindCurses-remove-unused-check' into releaseBrad King2015-02-201-2/+0
|\
| * FindCurses: Drop unused check for cbreak in tinfo libraryBrad King2015-02-201-2/+0
| | | | | | | | | | | | | | | | | | | | This check was first added by commit v3.0.0-rc5~6^2 (FindCurses: Detect and satisfy ncurses dependency on tinfo, 2014-01-17), but it is not correctly conditioned on existence of the tinfo library and fails if the code path is taken but tinfo is not found. However, since commit v3.2.0-rc1~369^2 (FindCurses: Drop search for deprecated HP-UX cur_colr library, 2014-11-17) the result of the check is not used, so simply drop it.
* | Merge branch 'private-FindJsonCpp' into releaseBrad King2015-02-201-117/+0
|\ \
| * | FindJsonCpp: Drop new module due to upstream jsoncpp providing packageBrad King2015-02-201-117/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Since jsoncpp 0.7.0 (2014-11-20) the upstream may provide a CMake package configuration file such that find_package(jsoncpp) will find a jsoncppConfig.cmake file. In order to avoid conflicting with this (especially on case-insensitive filesystems), and since we always prefer projects to provide package config files (that they maintain), it is better to not provide FindJsonCpp publicly. Move FindJsonCpp into a private source directory that is not installed so that we can still use it for building CMake itself. Reported-by: Ryan Pavlik <ryan.pavlik@gmail.com>
* | FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)Tiago Stürmer Daitx2015-02-181-0/+1
|/ | | | | JDK9's directory structure changes and no jdk/jre exists. The arch lib path is now jdk/lib/<arch> (instead of jdk/jre/lib/<arch>).
* Merge branch 'cpack_rpm_mulit_prefix_fixup' into releasev3.2.0-rc1Brad King2015-02-111-1/+6
|\
| * CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEWDomen Vrankar2015-02-111-1/+6
| | | | | | | | | | | | The file(GLOB_RECURSE) call added by commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes for one package, 2015-01-21) should not follow directory symlinks, so make sure CMP0009 is set to NEW.
* | Merge branch 'FindCoin3D-drop-link' into releaseBrad King2015-02-111-2/+1
|\ \ | |/ |/|
| * FindCoin3D: Drop link to project homepageBrad King2015-02-111-2/+1
| | | | | | | | | | | | | | | | The project has moved from <http://www.coin3d.org/> to <https://bitbucket.org/Coin3D/coin/wiki/Home>. Simply drop the out-dated link. Few find modules have links to the project sites. Anyone looking to use a given find module likely already knows about the project it finds and can use a search engine to find its homepage.
* | CPackRPM: Fix recognition of absolute relocation pathsDomen Vrankar2015-02-101-1/+1
|/ | | | | Fix typo in logic added by commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes for one package, 2015-01-21).
* Merge topic 'fix-C-standard-features'Brad King2015-02-0510-13/+26
|\ | | | | | | | | | | | | | | | | fb3487a9 Features: Fix C90 feature detection. 6027798a Features: Allow setting standard dialect below the default. 9d767810 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers. 72537e44 Features: Add dialect compile flags only if default is known. 82c9d686 AppleClang: Remove redundant UNIX condition.
| * Features: Fix C90 feature detection.Stephen Kelly2015-02-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug caused c_function_prototypes to not be recorded at configure time when compiling with -std=gnu99 or similar. In the case of feature recording, that was not a problem, because the logic in CMakeDetermineCompileFeatures.cmake currently assumes that a feature present for an earlier standard is present for a later standard. However, the detection strings are also used in WriteCompilerDetectionHeader, so the feature macro has been defined to '0' when using a later language dialect. Fix that by not checking the existence of the __STDC_VERSION__ macro at all when detecting C90 features.
| * Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.Stephen Kelly2015-02-047-8/+21
| | | | | | | | | | | | If no compiler feature information is known for a given compiler version, do not set a language standard default either. The two settings must be recorded consistently.
| * AppleClang: Remove redundant UNIX condition.Stephen Kelly2015-02-042-2/+2
| |
* | CPack: Fix NSIS default 64-bit Windows install directory (#14211)Brad King2015-02-041-3/+8
| | | | | | | | | | | | | | | | | | | | When targeting Windows with a 64-bit architecture, use "$PROGRAMFILES64" to get the Program Files folder. Use CMAKE_SIZEOF_VOID_P to check for the architecture size instead of CMAKE_CL_64 because the latter is not defined for all compilers. Inspired-by: Hugh Sorby <h.sorby@auckland.ac.nz> Inspired-by: İsmail Dönmez <ismail@donmez.ws>
* | Merge topic 'fix-msvc-linker-flags-typo'Brad King2015-02-042-2/+2
|\ \ | | | | | | | | | | | | 467f5bcc MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)
| * | MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)Brad King2015-02-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT from the value of CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT rather than the one for the DEBUG configuration. This typo has been present since the logic was first added in commit 36db45082e (ENH: fix up several problems with new stuff, 2002-11-11). Reported-by: Gunnar Roth <gunnar.roth@gmx.de>
* | | Merge topic 'CTestCoverageCollectGCOV-refinements'Brad King2015-02-041-5/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 809a5a5e Help: Add notes for topic 'CTestCoverageCollectGCOV-refinements' 03c0812c CTestCoverageCollectGCOV: Fix handling of international characters 8caa4e72 CTestCoverageCollectGCOV: Add test case 5c828cc8 CTestCoverageCollectGCOV: Allow custom flags to gcov 30cb628e CTestCoverageCollectGCOV: Fix handling of large file counts
| * | | CTestCoverageCollectGCOV: Fix handling of international charactersBrad King2015-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading the list of target support directories, read the file with UTF-8 encoding since that is what CMake writes into the file. This allows us to support international characters in the path to the build tree containing the target support directories.
| * | | CTestCoverageCollectGCOV: Allow custom flags to gcovBill Hoffman2015-02-031-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a GCOV_OPTIONS option to allow specification of custom flags. In ctest_coverage gcov support, if you set CTEST_COVERAGE_EXTRA_FLAGS, they get put on the command line before the -o. In this case we remove the -b and replace it with GCOV_OPTIONS. All other arguments remain the same.
| * | | CTestCoverageCollectGCOV: Fix handling of large file countsBill Hoffman2015-02-031-2/+9
| | | | | | | | | | | | | | | | Use the --files-from option to tar to handle lots of files.
* | | | Merge topic 'rpm_multi_prefix'Brad King2015-02-031-11/+104
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3ec02547 CPackRPM: Allow multiple path relocation prefixes for one package
| * | | | CPackRPM: Allow multiple path relocation prefixes for one packageDomen Vrankar2015-01-291-11/+104
| | | | |
* | | | | Features: Update GNU 5.0 C++14 features.Stephen Kelly2015-01-311-0/+2
| |_|_|/ |/| | | | | | | | | | | | | | | Trunk already has these features and they are listed in the status page. Also confirmed manually by running trunk.
* | | | Features: Record for MSVC 2010-2015Robert Maynard2015-01-303-2/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, in WCDH add MSVC Compatibility for cxx_align{of,as}. Co-Author: Stephen Kelly <steveire@gmail.com> Co-Author: Brad King <brad.king@kitware.com>
* | | | Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324)Brad King2015-01-291-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "cmakexbuild" wrapper is not needed for Xcode 4 and above, and the path to it may change when CMake moves. Avoid storing a specific path to a build program in CMakeCache.txt and instead compute the value for CMAKE_MAKE_PROGRAM on demand. However, if a user does set the value explicitly then honor it. This does for Xcode what commit v3.0.0-rc1~260^2~4 (VS: Switch to internal CMAKE_MAKE_PROGRAM lookup by generators, 2013-11-15) did for Visual Studio generators.
* | | | Merge topic 'OpenSSL_102'Brad King2015-01-281-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | c5d9a828 FindOpenSSL: fix detection of OpenSSL 1.0.2
| * | | FindOpenSSL: fix detection of OpenSSL 1.0.2Guillaume Belz2015-01-271-1/+1
| | |/ | |/|
* | | Configure some CMake-provided targets with USES_TERMINAL (#14915)Sylvain Joubert2015-01-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make them use the 'console' pool with the Ninja generator. Impacted targets are: - Built-in targets: install, install/local, install/strip, tests, package, package_source, rebuild_cache - Targets provided by the CTestTargets module: Nightly, Continuous, Experimental, and all their variants (*Start, *Configure, ...)
* | | ExternalProject: Allow ALWAYS step property to be switched (#15368)Brad King2015-01-231-0/+9
| | | | | | | | | | | | | | | | | | | | | Within an existing build tree, if the stamp for a step already exists when one activates the ALWAYS option, we still want it to always build. Remove the step stamp file during CMake configuration to ensure it does not exist when the ALWAYS option is enabled.
* | | Merge topic 'FindCUDA-more-advanced-cache-entries'Brad King2015-01-231-0/+4
|\ \ \ | | | | | | | | | | | | | | | | 005b409d FindCUDA: Mark more cache variables as advanced
| * | | FindCUDA: Mark more cache variables as advancedMark Abraham2015-01-221-0/+4
| | | | | | | | | | | | | | | | | | | | Mark variables pertaining to specific situations relevant to CUDA compilation as advanced since they are not part of normal usage.
* | | | Merge topic 'FeatureSummary-fix-doc-typo'Brad King2015-01-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b79d8f29 FeatureSummary: Fix bracket in documentation.
| * | | | FeatureSummary: Fix bracket in documentation.Christoph Grüninger2015-01-231-2/+2
| | |/ / | |/| |
| * | | Merge branch 'FindQt-fixes' into releaseBrad King2015-01-161-3/+10
| |\ \ \
| * \ \ \ Merge branch 'fix-qcc-compiler-id' into releaseBrad King2015-01-153-3/+3
| |\ \ \ \
* | \ \ \ \ Merge topic 'cdash_upload_file_mode'Brad King2015-01-221-0/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f3e0b6f1 CTestCoverageCollectGCOV: Add module to run gcov 6dd980e0 ctest_submit: Make CDASH_UPLOAD mode arguments more strict 5dc33f89 ctest_submit: Add CDASH_UPLOAD mode to upload files to CDash
| * | | | | | CTestCoverageCollectGCOV: Add module to run gcovBill Hoffman2015-01-221-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a function to run gcov and create a tarball of results. Since CDash tracks the md5sum of the files uploaded, use the --mtime option with "cmake -E tar" so that tar files could be created that would have the same md5sum with the same content.
* | | | | | | Merge topic 'FindCUDA-cusolver'Brad King2015-01-221-0/+7
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | e56c9327 FindCUDA: Add cuSOLVER library from CUDA 7.0
| * | | | | | FindCUDA: Add cuSOLVER library from CUDA 7.0Andrew Seidl2015-01-211-0/+7
| |/ / / / /
* | | | | | Merge topic 'GNU-4.4-compile-features'Brad King2015-01-221-3/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 965a50dc Features: Fix GNU 4.4 and 4.5 C standard level flags 7f4154a4 Features: Fix CompileFeatures non-feature tests for space in path f40c19b5 Features: Fix CompileFeatures test for C non-features
| * | | | | Features: Fix GNU 4.4 and 4.5 C standard level flagsBrad King2015-01-211-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C90 flags were only the "89" versions until GNU 4.5. The C11 flags were not introduced until GNU 4.6.
* | | | | | Merge topic 'find-package-mode-fix-multiarch'Brad King2015-01-201-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48984958 CMakeFindPackageMode: Fix Debian multiarch default guess (#15250)
| * | | | | | CMakeFindPackageMode: Fix Debian multiarch default guess (#15250)Felix Geyer2015-01-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v2.8.6~102^2~18 (Better support for lib64 and Debian multiarch, 2011-07-14) variable names "..._LANGUAGE_ARCHITECTURE" were set instead of the correct "..._LIBRARY_ARCHITECTURE". Fix this typo and also set the language-independent variable CMAKE_LIBRARY_ARCHITECTURE.
* | | | | | | Merge topic 'GNU-4.4-compile-features'Brad King2015-01-194-14/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 004e1540 Features: Record for GNU 4.4. 2a5ca650 Features: Wrap failure-test in UNIX condition. 1ae2c6b2 Features: Blacklist cxx_constexpr test for GNU 4.5. c66e3317 Features: Use a more-common feature in cycle-test. c43a6dc5 Features: Update comment in test to match the code. 78259135 Features: Test presence of cxx_auto_type with genex. 7b9fc88b Features: Remove outdated comment.
| * | | | | | Features: Record for GNU 4.4.Stephen Kelly2015-01-184-13/+11
| | | | | | |
| * | | | | | Features: Remove outdated comment.Stephen Kelly2015-01-171-1/+0
| | | | | | |
* | | | | | | Merge topic 'SolarisStudio-compile-features'Brad King2015-01-193-0/+74
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00194ea7 Help: Add notes for topic 'SolarisStudio-compile-features' bcb04783 Features: Record for SolarisStudio 12.4. 536c535c Features: Adjust cxx_variadic_templates unit test for SolarisStudio. 5d57970d Features: Use variable in cxx_inheriting_constructors test. 69182ce4 Features: Ensure that the cxx_auto_type test is correct.
| * | | | | | | Features: Record for SolarisStudio 12.4.Stephen Kelly2015-01-173-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has similar C++11 capabilities compared to GCC 4.8.
View Lorry Controller Status