summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmLocalGenerator: Constify AppendDefines and AddCompileDefinitionsBrad King2016-06-102-7/+10
|
* Merge topic 'refactor-cmLocalGenerator-flags'Brad King2016-06-104-58/+66
|\ | | | | | | | | | | | | d9613b96 cmLocalGenerator: Move GetFrameworkFlags implementation to private helper 70d3bf85 cmLocalGenerator: Adopt GetFrameworkFlags method de4ee088 cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookup
| * cmLocalGenerator: Move GetFrameworkFlags implementation to private helperTobias Hunger2016-06-091-9/+19
| |
| * cmLocalGenerator: Adopt GetFrameworkFlags methodTobias Hunger2016-06-094-54/+55
| | | | | | | | Move it from cmCommonTargetGenerator.
| * cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookupTobias Hunger2016-06-081-6/+3
| |
* | 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 'watcom-workaround'Brad King2016-06-101-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ceebac93 Tests: Restore fix to Plugin test on Watcom compiler
| * | | | Tests: Restore fix to Plugin test on Watcom compilerBrad King2016-06-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.4.0-rc1~127^2 (Tests: Fix Plugin test on Watcom compiler, 2015-09-03) was reverted accidentally by automated .c_str() removal. Restore it and add a comment explaining why.
* | | | | Merge topic 'cmake-gui-osx-symlink-qt5-plugin'Brad King2016-06-101-0/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f2840155 cmake-gui: Teach Qt5 where plugins are when launched through a symlink
| * | | | | cmake-gui: Teach Qt5 where plugins are when launched through a symlinkRobert Maynard2016-06-091-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are on OSX and we are launching cmake-gui from a symlink, the application will fail to launch as it can't find the qt.conf file which tells it what the name of the plugin folder is. We need to add this path BEFORE the application is constructed as that is what triggers the searching for the platform plugins
* | | | | | CMake Nightly Date StampKitware Robot2016-06-101-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'ninja-no-ranlib-windows'Brad King2016-06-092-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ea598671 Run ranlib on archives only if the tool is available
| * | | | | Run ranlib on archives only if the tool is availableBrad King2016-06-082-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeFindBinUtils sets CMAKE_RANLIB to `:` if it is not available in order to get a no-op. This does not work on a Windows host build environment that runs commands in `cmd` instead of `sh`. Teach the Ninja and Makefile generators to simply skip the command if it is `:`. This this was already done by the Makefile generator since commit v2.6.0~3161 (BUG: Do not write link script lines that use the ':', 2006-06-18), but only when using a link script. Reported-by: Michael Jäntsch <Michael.Jaentsch@gmx.de>
* | | | | | Merge topic 'refactor-cmLocalGenerator-flags'Brad King2016-06-095-16/+17
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | b0d3e693 cmLocalGenerator: Pass configuration to GetTargetFlags
| * | | | | cmLocalGenerator: Pass configuration to GetTargetFlagsTobias Hunger2016-06-085-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the configuration lookup to call sites. This will allow multi-configuration callers to use the method.
* | | | | | Merge topic 'small-cleanups'Brad King2016-06-099-43/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f25fc4d Prefer std::ostream& over derivatives as parameters f9cc43ea cmake: remove unnused member Verbose 6e658085 cmake: Fix constness of methods 87ffd76d cmake: Make internal method file static fa169fe8 Parser: Merge identical conditions
| * | | | | | Prefer std::ostream& over derivatives as parametersDaniel Pfeifer2016-06-086-14/+13
| | | | | | |
| * | | | | | cmake: remove unnused member VerboseDaniel Pfeifer2016-06-082-8/+2
| | | | | | |
| * | | | | | cmake: Fix constness of methodsStephen Kelly2016-06-082-14/+15
| | | | | | |
| * | | | | | cmake: Make internal method file staticStephen Kelly2016-06-082-4/+2
| | | | | | |
| * | | | | | Parser: Merge identical conditionsStephen Kelly2016-06-081-3/+0
| |/ / / / /
* | | | | | Merge topic 'xmlwriter'Brad King2016-06-093-85/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9da5192 CPack/PackageMaker: port to cmXMLWriter
| * | | | | | CPack/PackageMaker: port to cmXMLWriterDaniel Pfeifer2016-06-093-85/+85
| |/ / / / /
* | | | | | Merge topic 'java-export-targets'Brad King2016-06-0915-17/+402
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Help: Add notes for topic 'java-export-targets'Brad King2016-06-071-0/+6
| | | | | |
| * | | | | Tests: Add test for exported JARsMatthew Woehlke2016-06-0710-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a unit test to test the new functions to export JAR targets. The test builds three sub-projects: two that generate and export a JAR (one does a build-directory-only export, one an install-only export), and a third that consumes the first two as imported targets.
| * | | | | 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.
| * | | | | Tests/Java: Clean up style of Java test codeMatthew Woehlke2016-06-072-12/+12
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-091-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'add-FindVulkan'Brad King2016-06-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b8a00b67 Tests/FindVulkan: Run clang-format
| * | | | | Tests/FindVulkan: Run clang-formatBrad King2016-06-081-1/+1
| | | | | |
* | | | | | Merge topic 'fix-libarchive-openssl-no-hashes'Brad King2016-06-081-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbc9f73d libarchive: Restore OpenSSL include directory from upstream
| * | | | | | libarchive: Restore OpenSSL include directory from upstreamBrad King2016-06-071-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto library, 2016-05-03) we accidentally dropped the include directory for OpenSSL as well as the library. Without that, it works only accidentally when CHECK_CRYPTO happens to choose the OpenSSL implementation and add the include directory. Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
* | | | | | Merge topic 'add-FindVulkan'Brad King2016-06-088-0/+149
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | adf4df28 Add FindVulkan.cmake.
| * | | | | Add FindVulkan.cmake.Matthäus G. Chajdas2016-06-088-0/+149
| | | | | | | | | | | | | | | | | | | | | | | | This adds FindVulkan with corresponding tests.
* | | | | | Merge topic 'doc-ctest_update'Brad King2016-06-082-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b18180e Help: Document CTest Git fetch-and-reset behavior 558e4d1e Help: Document ctest_update branch following behavior
| * | | | | | Help: Document CTest Git fetch-and-reset behaviorBrad King2016-06-081-0/+5
| | | | | | |
| * | | | | | Help: Document ctest_update branch following behaviorBrad King2016-06-081-0/+4
| | | | | | |
* | | | | | | Merge topic 'bzip2-debug-names'Brad King2016-06-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 132b8989 FindBZip2: Search for additional bz2d debug library name
| * | | | | | | FindBZip2: Search for additional bz2d debug library nameRoger Leigh2016-06-071-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'find_path-in-framework'Brad King2016-06-085-1/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 188baef0 find_path: Fix location of <dir/header.h> in a framework on OS X
generated by cgit v0.12 at 2025-01-06 22:30:19 (GMT)