summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Teach find_library and find_package to search lib32 paths (#11260)Daniel Scharrer2016-06-104-4/+11
| | | | | | | Add a ``FIND_LIBRARY_USE_LIB32_PATHS`` global property analogous to the ``FIND_LIBRARY_USE_LIB64_PATHS`` property. This helps find commands on multilib systems that use ``lib32`` directories and either do not have ``lib`` symlinks or point ``lib`` to ``lib64``.
* Merge topic 'FindProtobuf-proto-in-subdirs'Brad King2016-06-101-0/+8
|\ | | | | | | | | d4b8e813 FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs.
| * FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs.Vladimír Vondruš2016-06-091-0/+8
| |
* | Merge topic 'FindFreetype-dedup-arguments'Brad King2016-06-101-23/+12
|\ \ | | | | | | | | | | | | 746a4245 FindFreetype: Factor out common find command arguments
| * | FindFreetype: Factor out common find command argumentsStuart Mentzer2016-06-091-23/+12
| |/
* | Merge topic 'FindCUDA-android'Brad King2016-06-102-48/+287
|\ \ | | | | | | | | | | | | | | | 7229ae72 FindCUDA: Refactor Android(Tegra) support e9bfe8da FindCUDA: Adjust vertical whitespace
| * | FindCUDA: Refactor Android(Tegra) supportBoris Fomitchev2016-06-092-45/+282
| | | | | | | | | | | | Reviewed-by: James Bigler <jamesbigler@gmail.com>
| * | FindCUDA: Adjust vertical whitespaceBoris Fomitchev2016-06-091-3/+5
| | |
* | | Merge topic 'FindOpenSSL-BoringSSL'Brad King2016-06-101-4/+4
|\ \ \ | |/ / |/| | | | | | | | e937b4c3 FindOpenSSL: Do not assume that the version regex finds something
| * | FindOpenSSL: Do not assume that the version regex finds somethingVladimír Vondruš2016-06-091-4/+4
| |/ | | | | | | BoringSSL's openslv.h does not have the version information.
* | Merge topic 'java-export-targets'Brad King2016-06-092-5/+197
|\ \ | |/ |/| | | | | | | | | | | | | 0bd91ad4 UseJava: Fix race condition creating java class list 89df91b9 Help: Add notes for topic 'java-export-targets' 95d84369 Tests: Add test for exported JARs 5341c0d8 UseJava: Add infrastructure to export targets d91ec044 Tests/Java: Clean up style of Java test code
| * UseJava: Fix race condition creating java class listMatthew Woehlke2016-06-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify logic to unconditionally create an empty class list response file to instead only create the empty file if no classes are being compiled. Otherwise, the response file is created via a custom command that generates the correct list. This fixes a race condition on certain systems (e.g. HFS on OS X) where the dependency for creating the "correct" list can have the "same" (due to limited precision of the filesystem) timestamp as the empty file created at configure time, resulting in an empty class list being incorrectly used to invoke `jar` (resulting in `jar` being unhappy that it was not given any input files). Although one would have some hope that this doesn't affect "real" projects, it definitely does affect the JavaExportImport unit test, causing the same to fail randomly when run on an HFS partition.
| * UseJava: Add infrastructure to export targetsMatthew Woehlke2016-06-072-0/+192
| | | | | | | | | | | | Add additional functions to UseJava.cmake to create "exported" targets, similar to those of C/C++ libraries. In support of this, ensure that the JAR_FILE property of jar targets is always an absolute path.
* | Merge topic 'add-FindVulkan'Brad King2016-06-081-0/+85
|\ \ | | | | | | | | | | | | adf4df28 Add FindVulkan.cmake.
| * | Add FindVulkan.cmake.Matthäus G. Chajdas2016-06-081-0/+85
| | | | | | | | | | | | This adds FindVulkan with corresponding tests.
* | | FindBZip2: Search for additional bz2d debug library nameRoger Leigh2016-06-071-1/+1
| |/ |/|
* | Merge topic 'SunOS-PathScale'Brad King2016-06-074-0/+37
|\ \ | | | | | | | | | | | | fcfe121f Platform: add flag definitions for PathScale compiler on SunOS (#16135)
| * | Platform: add flag definitions for PathScale compiler on SunOS (#16135)Michał Górny2016-06-064-0/+37
| | |
* | | Merge topic 'productbuild'Brad King2016-06-062-0/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 63e5eb5f Help: Add notes for 'productbuild' topic 2e3c67d1 productbuild: Add new productbuild cpack generator. 50a3d340 PackageMaker: factor out common code for creating pkg files.
| * | | productbuild: Add new productbuild cpack generator.Clinton Stimpson2016-06-032-0/+41
| |/ / | | | | | | | | | This cpack generator basically replaces the obsolete PackageMaker generator.
* | | Merge topic 'FindBoost-vs-prebuilt'Brad King2016-06-061-19/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | c3a281fd FindBoost: Search in official Windows prebuilt binary library directory 3720d5f4 FindBoost: Test `CMAKE_CXX_COMPILER_{ID,VERSION}` instead of `MSVC*`
| * | | FindBoost: Search in official Windows prebuilt binary library directoryAlex Turbov2016-06-031-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the need to specify `BOOST_LIBRARYDIR` along with `BOOST_ROOT` when using prebuilt binaries such as these: https://sourceforge.net/projects/boost/files/boost-binaries/
| * | | FindBoost: Test `CMAKE_CXX_COMPILER_{ID,VERSION}` instead of `MSVC*`Alex Turbov2016-06-031-19/+22
| | |/ | |/|
* | | Merge topic 'FindLibArchive-3.2'Brad King2016-06-061-4/+5
|\ \ \ | |/ / |/| | | | | | | | 38d18bab FindLibArchive: Support libarchive 3.2 version string format
| * | FindLibArchive: Support libarchive 3.2 version string formatOrion Poplawski2016-06-031-4/+5
| |/
* | Merge topic 'minor-cleanups'Brad King2016-06-037-0/+3
|\ \ | | | | | | | | | | | | | | | f6c21894 Modules: Rename internal platform-specific compiler determination modules 0c7951a9 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
| * | Modules: Rename internal platform-specific compiler determination modulesBrad King2016-06-027-0/+3
| |/ | | | | | | | | | | | | Rename Modules/Platform/<os>-<lang>.cmake files to Modules/Platform/<os>-Determine-<lang>.cmake to clarify their role. For compatibility with user-provided modules, load the old names if they exist.
* | Merge topic 'cpack-nsis-remove-duplicate-include'Brad King2016-06-031-7/+0
|\ \ | | | | | | | | | | | | e847b6c8 CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)
| * | CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)Brad King2016-06-021-7/+0
| |/ | | | | | | | | | | In commit v2.6.0~3438 (ENH: Better support for adding and removing path, 2006-04-27) an include of "WinMessages.NSH" was added without removing the original include. Remove it now.
* | Merge topic 'FindOpenCL-imported-target'Brad King2016-06-031-2/+18
|\ \ | | | | | | | | | | | | b66d4739 FindOpenCL: Add an imported target
| * | FindOpenCL: Add an imported targetMatthäus G. Chajdas2016-06-021-2/+18
| |/
* | Merge topic 'compiler-id-with-bracket-in-path'Brad King2016-06-031-2/+3
|\ \ | | | | | | | | | | | | a7d1c4ec CMakeDetermineCompilerId: Fix compiler id with square brackets in the path
| * | CMakeDetermineCompilerId: Fix compiler id with square brackets in the pathBrad King2016-06-021-2/+3
| |/ | | | | | | | | | | | | | | | | | | We use file(GLOB) to load the list of files produced by compiling the compiler identification source. Encode square brackets in the path to the directory so that they are not treated as special characters in the globbing expression. Otherwise we fail to find any files when the path contains square brackets and the compiler id is unknown. Reported-by: Esch Nigma <eschnigma@openmailbox.org>
* | Merge topic 'fix-ti-link-order'Brad King2016-06-031-1/+1
|\ \ | | | | | | | | | | | | 89317915 Compiler/TI: Pass libraries as last part to linker
| * | Compiler/TI: Pass libraries as last part to linkerAlexander Stein2016-06-021-1/+1
| |/ | | | | | | | | | | | | | | | | If e.g. libc.a is passed before any objects the linker raises the follwing warning: cannot resolve archive libc.a to a compatible library, as no input files have been encountered In the end the library is skipped and missing symbols occur. Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
* | FindHDF5: Add backwards compatability for already-found searchesChuck Atkins2016-06-021-4/+11
|/
* Merge topic 'UseJava-fix-typo'Brad King2016-06-011-1/+1
|\ | | | | | | | | bcf39688 UseJava: Fix grammar error in documentation
| * UseJava: Fix grammar error in documentationMatthew Woehlke2016-05-311-1/+1
| |
* | CPackRPM and CPackDeb documentation improvementsDomen Vrankar2016-06-012-113/+165
|/
* Merge topic 'osx-no-warn-sdk-target-mismatch'Brad King2016-05-271-10/+0
|\ | | | | | | | | cffe0ed7 OS X: Drop warning about SDK and deployment target version mismatch
| * OS X: Drop warning about SDK and deployment target version mismatchBrad King2016-05-261-10/+0
| | | | | | | | | | | | | | | | | | OS X supports using the SDK for any version equal to or newer than the deployment target. There is no reason to warn if the versions do not match exactly. Suggested-by: James Burgess <jamesrburgess@mac.com> Suggested-by: Clinton Stimpson <clinton@elemtech.com>
* | Merge topic 'cpack-dmg-no-app-link'Brad King2016-05-261-0/+5
|\ \ | | | | | | | | | | | | 3acc29fc CPack/DragNDrop: Optionally disable `/Applications` symlink
| * | CPack/DragNDrop: Optionally disable `/Applications` symlinkHarry Mallon2016-05-251-0/+5
| |/
* | Merge topic 'FindCUDA-cublas_device'Brad King2016-05-261-2/+4
|\ \ | | | | | | | | | | | | 81e73b72 FindCUDA: Add support for finding the cublas_device library
| * | FindCUDA: Add support for finding the cublas_device libraryJames Sharpe2016-05-251-2/+4
| |/
* | Merge topic 'FindMatlab-2016a'Brad King2016-05-261-0/+1
|\ \ | | | | | | | | | | | | 715e4cf5 FindMatlab: Add support for Matlab 2016a (9.0)
| * | FindMatlab: Add support for Matlab 2016a (9.0)Francesco Romano2016-05-251-0/+1
| | |
* | | Merge topic 'GetPrerequisites-more-paths'Brad King2016-05-261-0/+7
|\ \ \ | |_|/ |/| | | | | | | | c9cebed5 GetPrerequisites: Look for VS tools using registry entries (#16108)
| * | GetPrerequisites: Look for VS tools using registry entries (#16108)Brad King2016-05-251-0/+7
| |/
* | Merge topic 'FindCUDA-flags-genex'Brad King2016-05-251-2/+7
|\ \ | |/ |/| | | | | 6b190b5c FindCUDA: Add support for generator expressions in CUDA_NVCC_FLAGS