summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-generator-platform'Brad King2014-09-1079-86/+438
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 09c8ad99 enable_language: Initialize system-specific generator info only once 09ab207c Tests: Add generator platform support 6944997b ExternalProject: Propagate the generator platform 8d332091 CTest: Add options to set generator platform b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8 0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option 4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable 68d4280a VS: Refactor internal default platform name selection ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods 03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
| * enable_language: Initialize system-specific generator info only onceBrad King2014-09-101-20/+24
| | | | | | | | | | | | Call SetSystemName, SetGeneratorPlatform, and SetGeneratorToolset exactly once after reading CMakeSystem.cmake, and not again on another call to enable_language() or project().
| * Tests: Add generator platform supportBrad King2014-09-1042-7/+68
| | | | | | | | | | Propagate CMAKE_GENERATOR_PLATFORM through the test hierarchy so that all tests can build with the selected generator platform, if any.
| * ExternalProject: Propagate the generator platformBrad King2014-09-051-0/+11
| | | | | | | | | | | | | | | | When the CMAKE_GENERATOR option is given to ExternalProject_Add, look also for option CMAKE_GENERATOR_PLATFORM to pass on to cmake as a cache definition. When no CMAKE_GENERATOR option is given explicitly then use the current project's CMAKE_GENERATOR_PLATFORM (since we already use its CMAKE_GENERATOR).
| * CTest: Add options to set generator platformBrad King2014-09-055-0/+27
| | | | | | | | | | | | | | | | | | | | The ctest_configure command already reads the CTEST_CMAKE_GENERATOR variable to get the value for the cmake -G option. Read new variable CTEST_CMAKE_GENERATOR_PLATFORM to pass on as CMAKE_GENERATOR_PLATFORM. The "ctest --build-and-test" mode already has "--build-generator" to specify the -G option to CMake. Add a "--build-generator-platform" option to specify a value to pass on as CMAKE_GENERATOR_PLATFORM.
| * VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8Brad King2014-09-0516-31/+146
| | | | | | | | | | | | | | | | | | For VS generator names that do not specify the platform name, read CMAKE_GENERATOR_PLATFORM to get it. Extend the RunCMake.GeneratorPlatform test with a case covering use of the x64 platform when the test generator is a Visual Studio generator whose name does not specify a platform.
| * CMake: Add CMAKE_GENERATOR_PLATFORM optionBrad King2014-09-0516-0/+120
| | | | | | | | | | | | | | | | | | | | | | Reject the option by default. It will be implemented on a per-generator basis. Pass the setting into try_compile project generation. Add cache entry CMAKE_GENERATOR_PLATFORM and associated variable documentation to hold the value persistently. Add a RunCMake.GeneratorPlatform test to cover basic use cases for the option. Verify that CMAKE_GENERATOR_PLATFORM is empty by default, and that it is rejected when the generator does not support a user setting.
| * Help: Document CMAKE_VS_PLATFORM_NAME variableBrad King2014-09-052-0/+8
| |
| * VS: Refactor internal default platform name selectionBrad King2014-09-053-7/+13
| | | | | | | | | | | | Rename the 'PlatformName' member to 'DefaultPlatformName' and make sure it is only read through a 'GetPlatformName()' call. This will allow non-default names to be chosen later.
| * cmGlobalVisualStudio10Generator: Re-order some methodsBrad King2014-09-052-14/+14
| | | | | | | | | | Order SetSystemName and SetGeneratorToolset method declarations and definitions as they are called.
| * cmGlobalGenerator: Call SetGeneratorToolset even for empty toolsetBrad King2014-09-054-26/+26
| | | | | | | | | | | | Move handling of an empty toolset name into the implementation of the method. This simplifies the VS 10 implementation of default toolset selection because it has one code path that is always called.
* | Merge topic 'update-kwsys'Brad King2014-09-103-6/+72
|\ \ | | | | | | | | | | | | | | | daab3b3b Merge branch 'upstream-kwsys' into update-kwsys 92b582a6 KWSys 2014-09-08 (fb77be5a)
| * \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-09-093-6/+72
| |\ \
| | * | KWSys 2014-09-08 (fb77be5a)KWSys Robot2014-09-093-6/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ fb77be5a | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 32023afd..fb77be5a Brad King (1): 80e852f6 kwsysPlatformTests: Use if(DEFINED) to simplify conditions Clinton Stimpson (2): 93eb1a1f SystemTools: Improve RelativePath() to handle ./ ../ and // fb77be5a SystemTools: Fix GetCasePathName to handle wildcards on Windows. Change-Id: Ieff09366e214055be0b62eae42fc64f3bb3b6e76
* | | | Merge topic 'FindIce-updates'Brad King2014-09-101-18/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 2131aedd FindIce: Respect Ice_FIND_QUIETLY when printing messages d5047ca1 FindIce: Remove unneeded search path modification
| * | | | FindIce: Respect Ice_FIND_QUIETLY when printing messagesRoger Leigh2014-09-091-12/+16
| | | | |
| * | | | FindIce: Remove unneeded search path modificationRoger Leigh2014-09-091-7/+0
| | | | | | | | | | | | | | | | | | | | Drop code adding redundant "/opt/Ice-${ice_version}" paths.
* | | | | Merge topic 'string-uuid-doc-fix'Brad King2014-09-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e6ba52e8 StringUuid: Mark UPPER flag optional in sub-command synopsis
| * | | | | StringUuid: Mark UPPER flag optional in sub-command synopsisNils Gladitz2014-09-101-1/+1
| | | | | |
* | | | | | Merge topic 'tolerate-lib-dir-symlink'Brad King2014-09-101-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f99cc9c3 Tolerate symlinks during RPATH ordering (#13429)
| * | | | | | Tolerate symlinks during RPATH ordering (#13429)Brad King2014-09-091-2/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Arch Linux, /lib and /lib64 are symlinks to /usr/lib. When ordering runtime library search paths, we must not consider these to be distinct directories. Before considering conflicts between two directories, check that they do not have the same 'realpath'. Inspired-by: Myles English <mylesenglish@gmail.com>
* | | | | | CMake Nightly Date StampKitware Robot2014-09-101-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2014-09-090-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ExternalProject-download-loop' into releaseBrad King2014-09-081-0/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'use-consistent-regex-for-info-strings'Brad King2014-09-094-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e84e78c Use a more reliable regex for extracting binary INFO strings
| * | | | | | | | Use a more reliable regex for extracting binary INFO stringsChuck Atkins2014-09-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few different regular expressions were being used in various places to extract info strings from binaries. This uses a consistent regex amongst all of them now. This also fixes the broken ABI detection for Cray compilers.
* | | | | | | | | Merge topic 'doc-add_custom_command-multiple-commands'Brad King2014-09-091-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fdf4ff0 Help: Suggest in add_custom_command how to create a script (#15112)
| * | | | | | | | | Help: Suggest in add_custom_command how to create a script (#15112)Brad King2014-09-081-0/+3
| | | | | | | | | |
* | | | | | | | | | Merge topic 'ExternalProject-download-loop'Brad King2014-09-091-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | 9f49ac3d ExternalProject: Avoid infinite loop on file download hash mismatch
| * | | | | | | | ExternalProject: Avoid infinite loop on file download hash mismatchAlan W. Irwin2014-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the loop was added by commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when verification fails, 2015-01-15), we forgot to actually increment the loop counter. Add the increment line.
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-09-091-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2014-09-080-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'fix-clang-cross-compile-find-binutils' into releaseBrad King2014-09-052-2/+6
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'fix-clang-cross-compile-find-binutils'Brad King2014-09-082-2/+6
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | 72d66818 Fix finding binutils when cross-compiling with Clang
| * | | | | | | | Fix finding binutils when cross-compiling with ClangBrad King2014-09-052-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~342^2~2 (Add compiler target compile options, 2013-05-19) we use CMAKE_<LANG>_COMPILER_TARGET as the binutils prefix when cross-compiling with Clang. Fix the implementation to use the compiler target as the prefix only when it is set. Otherwise toolchain files not using CMAKE_<LANG>_COMPILER_TARGET cause the logic to use a prefix of just "-" and of course cannot find "-ar" or "-ld".
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-09-081-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-09-071-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-09-061-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-09-051-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'fix-gtk2-missing-optional-includes'Brad King2014-09-041-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8f0f7c FindGTK2: Fix missing optional include dirs.
| * | | | | | | | FindGTK2: Fix missing optional include dirs.Chuck Atkins2014-09-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindGTK2 was adding optional include directories to the interface include dirs regardless of whether or not they existed. This ensures that the directories only get added if they are actually found. This is particularly a problem on Solaris where the gtk2 libs and headers might exist but the FreeType2 headers might not.
* | | | | | | | | Merge branch 'release'Brad King2014-09-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'backport-xcode-duplicate-file-refs' into releaseBrad King2014-09-031-6/+4
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'doc-add_custom_command-multiple-commands'Brad King2014-09-041-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 412926d0 Help: Clarify add_custom_command multiple command behavior (#15112)
| * | | | | | | | | Help: Clarify add_custom_command multiple command behavior (#15112)Brad King2014-09-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly say that the commands are not composed into a stateful script.
* | | | | | | | | | Merge topic 'doc-try_compile-debug-advice'Brad King2014-09-041-3/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abbe91c5 Help: Clarify --debug-trycompile usage with try_compile
| * | | | | | | | | | Help: Clarify --debug-trycompile usage with try_compileAlan W. Irwin2014-09-031-3/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that try_compile calls need to be protected with conditions to avoid running more than once so that it is easy to isolate a single try_compile to perform with --debug-trycompile.
* | | | | | | | | | Merge topic 'xcode-duplicate-file-refs'Brad King2014-09-041-6/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d73f8828 Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs cf92fe2d Xcode: Generate per-target file references (#15111) e7114226 Xcode: Generate per-target file references (#15111)
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refsBrad King2014-09-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in Source/cmGlobalXCodeGenerator.cxx in favor of our side.
| | * | | | | | | | | Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
generated by cgit v0.12 at 2024-12-27 13:52:03 (GMT)