summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ios-universal-fixes'Brad King2016-06-271-2/+12
|\ | | | | | | | | | | 11c3a8dc CMakeIOSInstallCombined: add some sanity checks aff1e77f CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variables
| * CMakeIOSInstallCombined: add some sanity checksRuslan Baratov2016-06-251-0/+7
| |
| * CMakeIOSInstallCombined: do not merge content of OUTPUT and ERROR variablesRuslan Baratov2016-06-251-2/+5
| |
* | GetPrerequisites: fix typo in commentRolf Eike Beer2016-06-231-1/+1
|/
* Merge topic 'FindZLIB-fixup'Brad King2016-06-221-1/+1
|\ | | | | | | | | 4bb83514 FindZLIB: Do not mark unused variable as advanced
| * FindZLIB: Do not mark unused variable as advancedBrad King2016-06-211-1/+1
| | | | | | | | | | | | | | We no longer define the ZLIB_LIBRARY cache entry, so we should not mark it as advanced either. We only use this variable when someone else defines it in order to remain compatible with older versions of this module, but we never create the entry ourselves anymore.
* | Merge topic 'GetPrerequisites-findstr'Brad King2016-06-221-1/+5
|\ \ | | | | | | | | | | | | 867b73e2 GetPrerequisites: Optimize on Windows by filtering `objdump` output
| * | GetPrerequisites: Optimize on Windows by filtering `objdump` outputLaurent Tarrisse2016-06-211-1/+5
| |/ | | | | | | | | | | Extend the optimization from commit v3.4.0-rc1~264^2 (GetPrerequisites: Optionally filter "objdump" output for speed, 2015-07-29) to work on Windows by using `findstr` in place of `grep`.
* | Merge topic '14068-ctest-target-set-buildname-with-only-c-compiler'Brad King2016-06-211-6/+6
|\ \ | | | | | | | | | | | | 6509ad29 CTest: Properly set buildname if only C langage is enabled
| * | CTest: Properly set buildname if only C langage is enabledJean-Christophe Fillion-Robin2016-06-201-6/+6
| |/ | | | | | | Fixes #14068
* | Merge topic 'FindGLEW-debug'Brad King2016-06-211-9/+34
|\ \ | | | | | | | | | | | | 6087b9e4 FindGLEW: Search for debug and release configurations separately
| * | FindGLEW: Search for debug and release configurations separatelyFARBOS Arnaud2016-06-201-9/+34
| |/
* | Merge topic 'FindLua-match-header-and-lib'Brad King2016-06-211-45/+72
|\ \ | | | | | | | | | | | | | | | | | | | | | eecd307e FindLua: Iterate through all include subdirs to find a suitable header 3532cbce FindLua: Check header file against suitable versions 281c707b FindLua: Factor out a helper function for version extraction 92c67b9f FindLua: Prefix private APIs with `_lua_`
| * | FindLua: Iterate through all include subdirs to find a suitable headerIvan Ivanov2016-06-201-16/+29
| | | | | | | | | | | | Fixes #15756.
| * | FindLua: Check header file against suitable versionsIvan Ivanov2016-06-201-5/+12
| | |
| * | FindLua: Factor out a helper function for version extractionIvan Ivanov2016-06-201-23/+30
| | |
| * | FindLua: Prefix private APIs with `_lua_`Ivan Ivanov2016-06-201-8/+8
| |/
* | Merge topic 'FindBoost-imported-fallback-to-release'Brad King2016-06-211-7/+7
|\ \ | | | | | | | | | | | | c9fca42f FindBoost: Make imported targets fall back to `Release`
| * | FindBoost: Make imported targets fall back to `Release`Andreas Weis2016-06-201-7/+7
| |/ | | | | | | | | | | | | | | FindBoost only detects Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091.
* | Merge topic 'aix-clang'Brad King2016-06-212-0/+2
|\ \ | |/ |/| | | | | 5cc34162 AIX: Add support for Clang compiler
| * AIX: Add support for Clang compilerWu Zhao2016-06-202-0/+2
| | | | | | | | | | The platform information module for GNU on AIX can be reused for Clang on AIX because clang accepts almost all of the same options.
* | Merge topic 'FindQt4-doc-QtDeclarative-imported'Brad King2016-06-201-0/+2
|\ \ | | | | | | | | | | | | 5ed2881c FindQt4: Document Qt4::QtDeclarative imported target (#16157)
| * | FindQt4: Document Qt4::QtDeclarative imported target (#16157)Brad King2016-06-201-0/+2
| | |
* | | Merge topic 'pkgconfig-targets'Brad King2016-06-201-2/+6
|\ \ \ | | | | | | | | | | | | | | | | 8345c646 FindPkgConfig: define the imported targets also when the data comes from cache
| * | | FindPkgConfig: define the imported targets also when the data comes from cacheRolf Eike Beer2016-06-191-2/+6
| |/ /
| * | Merge branch 'SunOS-PathScale' into releaseBrad King2016-06-064-0/+37
| |\ \
| * \ \ Merge branch 'FindLibArchive-3.2' into releaseBrad King2016-06-031-4/+5
| |\ \ \
| * \ \ \ Merge branch 'FindHDF5-fix-already-found' into releasev3.6.0-rc1Brad King2016-06-021-4/+11
| |\ \ \ \
* | \ \ \ \ Merge topic 'FindFreetype-debug-lib'Brad King2016-06-201-10/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b213a7f6 FindFreetype: Find release and debug libraries separately
| * | | | | | FindFreetype: Find release and debug libraries separatelyStuart Mentzer2016-06-171-10/+22
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'revert-vs-clang-minsize'Brad King2016-06-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | 78249be2 VS: Fix regressed mapping for the cl `/Os` compiler flag
| * | | | | VS: Fix regressed mapping for the cl `/Os` compiler flagBrad King2016-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) a flag mapping was added for the clang `-Os` flag. However, this collides with a mapping we already had for the MSVC flag of the same name. This is a symptom of a larger problem in that the VS generators need a per-toolset flag map (issue #16153). For now, simply drop the new mapping and drop `-Os` from clang compiler flags in the MinSizeRel configuration. Reported-by: Felix Bruns <felixbruns@gmail.com>
* | | | | | Merge topic 'ice-debug'Brad King2016-06-171-6/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86bcdbcd FindIce: Support finding both release and debug libraries
| * | | | | | FindIce: Support finding both release and debug librariesRoger Leigh2016-06-161-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search for both release and debug library variants, and use SelectLibraryConfigurations to choose the appropriate library. Also add both release and debug libraries to the imported targets.
* | | | | | | Merge topic 'ice-3.6.2'Brad King2016-06-161-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82ecc2a3 FindIce: Add versions 3.6.1 and 3.6.2
| * | | | | | | FindIce: Add versions 3.6.1 and 3.6.2Roger Leigh2016-06-151-0/+2
| |/ / / / / /
* | | | | | | Merge topic 'findcuda-use-correct-runtime-for-required'Brad King2016-06-161-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | 90d114ed FindCUDA: Use the correct runtime in REQUIRED_VARS check
| * | | | | | FindCUDA: Use the correct runtime in REQUIRED_VARS checkChuck Atkins2016-06-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enabling the CUDA static runtime, the current module always uses the shared runtime in the REQUIRED_VARS check. This change should select the correct runtime to be checked for as required based on the CUDA_USE_STATIC_CUDA_RUNTIME option. Fixes #16096
* | | | | | | 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.
generated by cgit v0.12 at 2025-01-22 13:08:24 (GMT)