summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in Modules/GNUInstallDirs.cmake (#15176)David Coppa2014-09-291-2/+2
| | | | | Commit d4fdd9c189f85d659f4294f8ec6da3e7e51215ec ("GNUInstallDirs: use the proper default for info and man paths on OpenBSD") introduced a typo.
* Merge topic 'wix-directory-permissions'Brad King2014-09-296-6/+49
|\ | | | | | | | | d48c781f CPackWiX: Extend CPACK_WIX_ACL to support directories
| * CPackWiX: Extend CPACK_WIX_ACL to support directoriesNils Gladitz2014-09-276-6/+49
| |
* | Merge topic 'update-kwsys'Brad King2014-09-293-1/+38
|\ \ | | | | | | | | | | | | | | | 20853009 Merge branch 'upstream-kwsys' into update-kwsys a79ff0e4 KWSys 2014-09-25 (29ffaf43)
| * \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-09-263-1/+38
| |\ \
| | * | KWSys 2014-09-25 (29ffaf43)KWSys Robot2014-09-263-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 29ffaf43 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' fb77be5a..29ffaf43 Brad King (1): 29ffaf43 Suppress deprecation warnings for GetVersionEx Sean McBride (1): 6aa1f800 SystemInformation: Fix clang -Wtautological-pointer-compare warning Change-Id: I29f3dcf2a32e1b80bade233987eb091038aace65
* | | | Merge topic 'fix-test-FailedSubmit-match'Brad King2014-09-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e0acdd1a Tests: Adjust expected error message in FailedSubmit-ftp
| * | | | Tests: Adjust expected error message in FailedSubmit-ftpTony Kelman2014-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error message from cygwin's curl (using `--system-libs`) in CTestTestFailedSubmit-ftp was: Failed to connect to port 21: Connection timed out ^^^ Update our regex to match this.
* | | | | Merge topic 'build_cmake_dmg_with_bzip'Brad King2014-09-292-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ffa5db96 CMake now using bzip2 compression for mac release bundles.
| * | | | | CMake now using bzip2 compression for mac release bundles.Robert Maynard2014-09-242-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with OSX 10.4 dmg files offers bzip2 compression which offers small package sizes.
* | | | | | Merge topic 'remove-old-DartLocal.conf'Brad King2014-09-292-125/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a5d9256 Remove unused legacy 'DartLocal.conf' file
| * | | | | | Remove unused legacy 'DartLocal.conf' fileBrad King2014-09-242-125/+0
| |/ / / / /
* | | | | | Merge topic 'FindCUDA-cleanup-CMP0054'Brad King2014-09-292-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84e3fde9 FindCUDA: Avoid if() auto-dereference in string comparisons
| * | | | | | FindCUDA: Avoid if() auto-dereference in string comparisonsAdam Strzelecki2014-09-242-8/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | This silences possible CMP0054 warnings.
* | | | | | CMake Nightly Date StampKitware Robot2014-09-291-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-09-281-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-09-271-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-09-261-1/+1
| |/ / |/| |
* | | CMake Nightly Date StampKitware Robot2014-09-251-1/+1
|/ /
* | Merge topic 'fix_search_path_ios_trycompile'Brad King2014-09-241-0/+4
|\ \ | | | | | | | | | | | | 55a885da Teach try_compile COPY_FILE to look for IOS app bundles.
| * | Teach try_compile COPY_FILE to look for IOS app bundles.Bill Hoffman2014-09-231-0/+4
| | | | | | | | | | | | | | | The COPY_FILE option on try_compile never looked for IOS application bundles. This caused it to fail if the CMAKE_MACOSX_BUNDLE was set.
* | | Merge topic 'vs-wince-exe-entry-point'Brad King2014-09-241-2/+8
|\ \ \ | | | | | | | | | | | | | | | | e7aeb79f VS, WINCE: Only set EntryPointSymbol for executables
| * | | VS, WINCE: Only set EntryPointSymbol for executablesPascal Bach2014-09-221-2/+8
| | | |
* | | | Merge topic 'fix-LOCATION-slashes'Brad King2014-09-241-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 92b2c618 Remove extra slashes from LOCATION target property value
| * | | | Remove extra slashes from LOCATION target property valueBrad King2014-09-221-5/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.0.0-rc1~429^2~2 (Remove the Location member from cmTarget, 2012-10-07) a few extra slashes were added to the path construction logic, perhaps due to a partially implemented attempt at handling the case that GetDirectory returns an empty string. This leads to LOCATION paths with double slashes in some cases. Remove them now.
* | | | Merge topic 'ninja-compiler-change'Brad King2014-09-242-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6120fca8 Ninja: Prevent compilers to be silently modified
| * | | | Ninja: Prevent compilers to be silently modifiedSylvain Joubert2014-09-222-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike with Unix Makefiles generator modifying compiler paths was not protected with Ninja generator. It was possible to modify them in the cache without the expected effect on the generated solution. Also activate corresponding tests with Ninja.
* | | | | CMake Nightly Date StampKitware Robot2014-09-241-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-09-231-1/+1
| |/ / |/| |
* | | Merge topic 'wix-remember-install-dir'Brad King2014-09-221-0/+23
|\ \ \ | | | | | | | | | | | | | | | | e785fab5 CPackWiX: Teach WiX installers to remember the install location for upgrades
| * | | CPackWiX: Teach WiX installers to remember the install location for upgradesNils Gladitz2014-09-191-0/+23
| |/ /
* | | Merge topic 'vs-windows-store-certifictes'Brad King2014-09-221-0/+4
|\ \ \ | | | | | | | | | | | | | | | | d4ca8fb2 VS: Add Certificates to .vcxproj files
| * | | VS: Add Certificates to .vcxproj filesGilles Khouzam2014-09-191-0/+4
| |/ / | | | | | | | | | | | | | | | After certificates were moved into their own category in cmGeneratorTarget, that category was not added for output by the VS 10 generator. Add it now.
* | | Merge topic 'doc-toolchains'Brad King2014-09-221-11/+75
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 27022166 Help: Add Windows Phone/Store cross-compiling to cmake-toolchains.7 db54d872 Help: Add Windows CE cross-compiling to cmake-toolchains.7 manual 0d72451a Help: Add Cross Compiling subsections in cmake-toolchains.7 manual
| * | | Help: Add Windows Phone/Store cross-compiling to cmake-toolchains.7Brad King2014-09-191-0/+22
| | | | | | | | | | | | | | | | Show simple example toolchain files for each.
| * | | Help: Add Windows CE cross-compiling to cmake-toolchains.7 manualPascal Bach2014-09-191-0/+26
| | | |
| * | | Help: Add Cross Compiling subsections in cmake-toolchains.7 manualPascal Bach2014-09-191-14/+30
| |/ / | | | | | | | | | | | | Organize the "Cross Compiling" section into subsections by platform. This will make it easier to add more subsections for more platforms.
* | | Merge topic 'FindGettext-doc-update'Brad King2014-09-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 3919f254 FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)
| * | | FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)Brad King2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Rename GETTEXT_PROCESS_POT to GETTEXT_PROCESS_POT_FILE. Patch-by: maahnat@gmail.com
* | | | Merge topic 'fix-enable_language-missing-module-errors'Brad King2014-09-221-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1b549a5c enable_language: Fix error messages on missing modules (#15155)
| * | | | enable_language: Fix error messages on missing modules (#15155)Brad King2014-09-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmGlobalGenerator::EnableLanguage, fix error messages for missing module files to actually name the missing module instead of using the empty string returned by GetModulesFile.
* | | | | Merge topic 'FindProtobuf-depend-protoc'Brad King2014-09-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e380d7c5 FindProtobuf: Make outputs depend on protoc executable
| * | | | | FindProtobuf: Make outputs depend on protoc executableMichael Hanselmann2014-09-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After updating from Protocol Buffers 2.5.0 to 2.6.0 compilation of the generated source failed: "This file was generated by an older version of protoc which is incompatible with your Protocol Buffer headers. Please regenerate this file with a newer version of protoc.". Turns out the source and headers generated by way of FindProtobuf.cmake:PROTOBUF_GENERATE_CPP aren't updated. Adding a dependency on the compiler executable fixes this issue.
* | | | | Merge topic 'FindOpenSceneGraph-pieces-not-found'Brad King2014-09-221-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b683da3e FindOpenSceneGraph: Do not add unfound OSG libs if not required
| * | | | | FindOpenSceneGraph: Do not add unfound OSG libs if not requiredMattias Helsing2014-09-181-2/+5
| |/ / / /
* | | | | Merge topic 'autogen-fixes'Brad King2014-09-228-31/+176
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3c97a19 QtAutogen: Process all ui files in a source file (#14981). b8877b1d QtAutogen: Add source files to target when only AUTORCC is used.
| * | | | | QtAutogen: Process all ui files in a source file (#14981).Stephen Kelly2014-09-187-30/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a vector to store a list of matched ui_ includes, instead of overwriting the previous match.
| * | | | | QtAutogen: Add source files to target when only AUTORCC is used.Stephen Kelly2014-09-173-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Add missing entry to if condition.
* | | | | | Merge topic 'minor-cleanups'Brad King2014-09-222-9/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80bda168 Simplify use of binary_search. 1927e4ba Remove const char string comparison helper.
| * | | | | | Simplify use of binary_search.Stephen Kelly2014-09-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A local string was created when dir was a const char*. Now dir is a std::string already so the dirString is vestigal.
generated by cgit v0.12 at 2024-11-11 12:17:09 (GMT)