summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'DetermineVsServicePack2012'David Cole2012-09-251-0/+3
|\ | | | | | | | | a722780 CMakeDetermineVSServicePack: Visual Studio 2012 added
| * CMakeDetermineVSServicePack: Visual Studio 2012 addedPhilip Lowman2012-09-221-0/+3
| |
* | Merge topic 'generator-expression-refactor'David Cole2012-09-252-1/+6
|\ \ | | | | | | | | | | | | | | | f20af79 Handle colons as a special case in the generator expression parser. fb578c8 Fix the regular expression validator for target names.
| * | Handle colons as a special case in the generator expression parser.Stephen Kelly2012-09-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like the special case for commas, this ensures that the colon only has special meaning as the delimiter between the identifier and the parameters of a particular expression, but constructs such as INCLUDE_DIRECTORIES "$<1:C:\foo>" are legal.
| * | Fix the regular expression validator for target names.Stephen Kelly2012-09-201-1/+1
| | | | | | | | | | | | | | | Regression introduced by f1eacf0e07759b57d100dbf5d83c70e4028bcb54. Target names have different valid contents to config names.
* | | Merge topic 'UpdateEmacsMode-bug0013548'David Cole2012-09-251-3/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | 301e67e cmake-mode.el: add local keybindings 6d1e4ef cmake-mode.el: Use more readable regex and case-fold-search
| * | | cmake-mode.el: add local keybindingsTom Schutter2012-09-211-1/+17
| | | | | | | | | | | | | | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
| * | | cmake-mode.el: Use more readable regex and case-fold-searchTom Schutter2012-09-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reimplement ab9824e. Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | Merge topic 'clang-PIE'David Cole2012-09-254-3/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ada9efd Clang: All versions know about -fPIE (#13550) 6e34aea Clang: Split Compiler/Clang* modules out from GNU (#13550)
| * | | | Clang: All versions know about -fPIE (#13550)Brad King2012-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GNU compiler information file tests for GNU >= 3.4 because earlier versions do not have the flag. The version number test is not valid for Clang compiler versions, but we know Clang supports the flag.
| * | | | Clang: Split Compiler/Clang* modules out from GNU (#13550)Brad King2012-09-194-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While Clang presents an almost identical interface to GNU there will be some differences. Split the compiler information modules to allow separate rules for Clang. Start by loading the GNU rules but leave a place to add Clang-specific information.
* | | | | Merge topic 'vs8-generator-doc'David Cole2012-09-252-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 750fcaa VS8: Remove '.NET' from generator description (#10158)
| * | | | | VS8: Remove '.NET' from generator description (#10158)Brad King2012-09-192-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | The product name does not include '.NET'. Use '8' instead to be consistent with the existing description of the '9' (2008) generator.
* | | | | Merge topic 'file-DOWNLOAD-EXPECTED_HASH'David Cole2012-09-254-30/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 95a0011 file(DOWNLOAD): Change EXPECTED_HASH to take ALGO=value
| * | | | | file(DOWNLOAD): Change EXPECTED_HASH to take ALGO=valueBrad King2012-09-194-30/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Make the EXPECTED_HASH option take only a single value instead of two to avoid handling sub-keyword arguments. This is also consistent with URL_HASH in ExternalProject.
* | | | | CMake Nightly Date StampKitware Robot2012-09-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2012-09-241-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2012-09-231-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2012-09-221-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2012-09-211-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2012-09-201-1/+1
| |/ |/|
* | Merge topic 'vs-link-rsp'Brad King2012-09-194-13/+28
|\ \ | | | | | | | | | | | | 5598d9b Ninja: don't expand any rsp files
| * | Ninja: don't expand any rsp filesPeter Kuemmel2012-09-194-13/+28
| | |
* | | Merge topic 'ExternalProject-DOWNLOAD_NAME'Brad King2012-09-191-1/+5
|\ \ \ | | | | | | | | | | | | | | | | 8da0fe4 ExternalProject: Add DOWNLOAD_NAME option
| * | | ExternalProject: Add DOWNLOAD_NAME optionBrad King2012-09-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some download URLs do not have the filename embedded in the url. Add an interface to specify the local filename explicitly. Suggested-by: James Goppert <james.goppert@gmail.com>
* | | | Merge topic 'file-DOWNLOAD-user-agent'Brad King2012-09-191-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 14aff4d file(DOWNLOAD): Add HTTP User-Agent string
| * | | | file(DOWNLOAD): Add HTTP User-Agent stringBrad King2012-09-181-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Some servers require a User-Agent string. The curl command-line tool just sends "curl/$curlver", so do the same. Suggested-by: Fredrik Ehnbom <fehnbom@nvidia.com>
* | | | Merge topic 'vs11-express'Brad King2012-09-195-9/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 7ee3cee VS11: Add VS 2012 Express support (#13348) e17f345 VS11: Detect VS 2012 Express for default generator (#13348)
| * | | | VS11: Add VS 2012 Express support (#13348)Brad King2012-09-184-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the registry entries that vsvars32.bat uses to detect the location of MSBuild.exe in the framework directory. Invoke MSBuild with the option /p:VisualStudioVersion=$version so it knows from which VS version to load the system build rules. Teach cmGlobalVisualStudio11Generator to set its ExpressEdition member using the registry.
| * | | | VS11: Detect VS 2012 Express for default generator (#13348)Brad King2012-09-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add WDExpress to the list of registry search locations. Add VS 11 to the list of VS versions and corresponding generator names. Fix the search logic to use the most recent version found under any registry entry. Inspired-by: Peter Kümmel <syntheticpp@gmx.net>
* | | | | Merge topic 'ninja-rc-compile-flag'Brad King2012-09-191-5/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a1c9c13 Ninja: filter target specific compile flags with language specific regex
| * | | | | Ninja: filter target specific compile flags with language specific regexPeter Kümmel2012-09-181-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync with Makefile code. Bug: 13486 Many thanks to Nils Gladitz
* | | | | | Merge topic 'document-MSVC-variables-12567'Brad King2012-09-191-6/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f35e35b add documentation for all MSVCxxx version variables (#12567)
| * | | | | | add documentation for all MSVCxxx version variables (#12567)Rolf Eike Beer2012-09-181-6/+30
| | | | | | |
* | | | | | | Merge topic 'osx-clang-target-flags'Brad King2012-09-193-0/+30
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | 011d5a4 OS X: Add platform-specific Clang compiler info files (#13536)
| * | | | | | OS X: Add platform-specific Clang compiler info files (#13536)Brad King2012-09-173-0/+30
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang has the same interface as GNU except that we do not need to test for the deployment target and sysroot flags. Simply set variables CMAKE_${lang}_HAS_ISYSROOT CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG to true because every version of Clang available on OS X supports these flags.
* | | | | | Merge topic 'generator-expression-refactor'Brad King2012-09-1921-229/+1388
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91011bd cmGeneratorExpression: Port users to two-stage processing f1eacf0 cmGeneratorExpression: Re-write for multi-stage evaluation
| * | | | | | cmGeneratorExpression: Port users to two-stage processingStephen Kelly2012-09-185-56/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the Process() API and removing the parameters from the constructor will allow cmGeneratorExpressions to be cached and evaluated with multiple configs for example, such as when evaluating target properties. This requires the creation of a new compiled representation of cmGeneratorExpression. The cmListFileBacktrace remains in the constructor so that we can record where a particular generator expression appeared in the CMakeLists file.
| * | | | | | cmGeneratorExpression: Re-write for multi-stage evaluationStephen Kelly2012-09-1818-201/+1321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expressions may be parsed and then cached and evaluated multiple times. They are evaluated lazily so that literals such as ',' can be treated as universal parameter separators, and can be processed from results without appearing literally, and without interfering with the parsing/evaluation of the entire expression.
* | | | | | | CMake Nightly Date StampKitware Robot2012-09-191-1/+1
| | | | | | |
* | | | | | | Merge topic 'findsdl-unlimited-main-13262'David Cole2012-09-181-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262)
| * | | | | | | FindSDL: add SDLMAIN_LIBRARY only once (#13262)Rolf Eike Beer2012-09-171-3/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'cleanup-TLS-and-SSL-interface'David Cole2012-09-183-65/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7369a8f file(DOWNLOAD): Make TLS options behave as documented 131d91a Rename SSL terminology to TLS
| * | | | | | | file(DOWNLOAD): Make TLS options behave as documentedBrad King2012-09-171-33/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added in commit e1c89f08 (file(DOWNLOAD): Add options for SSL, 2012-08-21) did not actually provide the documented behavior. Simplify the implementation to read the variable values first and then replace them with the explicit argument values if encountered. Always set the curl option CURLOPT_SSL_VERIFYPEER to either on or off explicitly instead of depending on the curl default behavior.
| * | | | | | | Rename SSL terminology to TLSBrad King2012-09-143-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLS has superseded SSL so rename the recently added file(DOWNLOAD) and ExternalProject options using the newer terminology. Drop "CURLOPT" from names because curl is an implementation detail.
* | | | | | | | Merge topic 'ExternalProject-check-hashes'David Cole2012-09-182-50/+77
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c266461 Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add. beb8a83 ExternalProject: Generalize URL_MD5 option to URL_HASH
| * | | | | | | Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add.Bill Hoffman2012-09-121-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to turn on and off ssl certificate authority checking. It also adds the ability to specify a certificate authority information file. This can be done by setting global cmake variables CMAKE_CURLOPT_CAINFO_FILE and or CMAKE_CURLOPT_SSL_VERIFYPEER in the project calling ExternalProject_Add, or by passing those options to individual ExternalProject_Add calls.
| * | | | | | | ExternalProject: Generalize URL_MD5 option to URL_HASHBrad King2012-09-112-50/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for SHA algorithms.
* | | | | | | | Merge topic 'vs-simplify-CreateLocalGenerator'David Cole2012-09-186-42/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f34321a VS: Remove duplicated implementations of CreateLocalGenerator()
| * | | | | | | | VS: Remove duplicated implementations of CreateLocalGenerator()Patrick Gansterer2012-09-146-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IA64 and Win64 versions of the VS8 and VS9 generators contain the same code for this function as in the base class.