summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-05-294-9/+18
|\
| * KWSys 2013-05-29 (725e541e)KWSys Robot2013-05-294-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 725e541e | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' f4928d44..725e541e Brad King (1): 9fd64779 SystemTools: Fix FileIsDirectory with long paths Rolf Eike Beer (3): e8269442 Tests: fix a warning with acc 87abd647 SystemInformation: fix truncation warnings 039d9598 fix warnings about sizeof() return value truncation Change-Id: I1c459346a622610eac62dfcd3abd0e73c5a83494
* | CMake Nightly Date StampKitware Robot2013-05-291-1/+1
| |
* | Merge topic 'fix-try_compile-library-spaces'Brad King2013-05-281-1/+1
|\ \ | | | | | | | | | | | | e65ef08 try_compile: Fix quoting of libraries in generated CMakeLists.txt
| * | try_compile: Fix quoting of libraries in generated CMakeLists.txtBrad King2013-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 236133e7 (Handle targets in the LINK_LIBRARIES of try_compile, 2013-02-09) libraries passed to the new LINK_LIBRARIES option of try_compile are not quoted inside the generated CMakeLists.txt file. Quote the library names so they re-parse correctly when loaded by CMake to configure and generate the test project. Reported-by: Bogdan Cristea <cristeab@gmail.com>
* | | Merge topic 'ExternalData-no-re-stage'Brad King2013-05-284-1/+47
|\ \ \ | | | | | | | | | | | | | | | | c35961b ExternalData: Do not re-stage staged object files
| * | | ExternalData: Do not re-stage staged object filesBrad King2013-05-244-1/+47
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ExternalData_LINK_CONTENT option tells ExternalData to convert real data files it finds into content links and to "stage" the original content in a ".ExternalData_<algo>_<hash>" file. However, after a data object has been staged it is possible that a user-provided pattern in the "REGEX:" option will later match the staged object file. We must not process staged object files even when a user pattern matches them. Fix the implementation to not match a staged object file as a normal data file for conversion. Extend the RunCMake.ExternalData test to cover this case.
* | | Merge topic 'fix-protobuf-threads'Brad King2013-05-281-0/+13
|\ \ \ | | | | | | | | | | | | | | | | 8961c4b FindProtobuf: also find pthread
| * | | FindProtobuf: also find pthreadMatthew Woehlke2013-05-241-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Modify FindProtobuf.cmake to find the pthread library on UNIX platforms, and to add the same to PROTOBUF_LIBRARIES, as this is a link dependency of libraries using the protobuf headers.
* | | | Merge topic 'silence-vs6-warnings'Brad King2013-05-284-4/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 015309f Tests/CompileDefinitions: Avoid spaces in defines on VS 6
| * | | | Tests/CompileDefinitions: Avoid spaces in defines on VS 6Stephen Kelly2013-05-244-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS 6 IDE does not like spaces in definition values so CMake drops them and warns. The Tests/CompileDefinitions test C code that looks for the dropped definitions already knows to skip them, but CMake still warns. Silence the warnings by avoiding such values in the first place on VS 6.
* | | | | Merge topic 'genex-generate-file'Brad King2013-05-2827-0/+430
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b983a58 file: Add GENERATE command to produce files at generate time
| * | | | | file: Add GENERATE command to produce files at generate timeStephen Kelly2013-05-2427-0/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to write to a temp file which contains generator expressions, and at generate time, evaluate the generator expressions, and write the result to a file. Because executables on Windows are limited in the length of command line it is possible to use, it is common to write command line arguments to a file instead and specify the file as a source of arguments. This new FILE(GENERATE) subcommand allows the use of generator expressions to create such files so that they can be used with add_custom_command for example.
* | | | | | Merge topic 'use-java-use-parse-arguments'Brad King2013-05-281-35/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81b5fb5 UseJava.cmake: fully use cmake_parse_arguments in add_jar
| * | | | | | UseJava.cmake: fully use cmake_parse_arguments in add_jarMatthew Woehlke2013-03-281-35/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify add_jar to fully use named arguments, rather than cmake variables, for specifying output names/directories, etc. For backward compatibility, the old variables are still honored if set, although named arguments will override them.
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-281-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-271-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-261-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-05-251-1/+1
| | | | | | |
* | | | | | | Merge topic 'fix-include_directories-whitespace-handling'Brad King2013-05-240-0/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | b8cc6f4 include_directories: Fix handling of empty or space-only entries
| * | | | | | include_directories: Fix handling of empty or space-only entriesStephen Kelly2013-05-243-2/+28
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0d46e9a0 (Store includes from the same include_directories call together., 2013-01-20) we accidentally use such entries. Fix the code to drop them instead. Update the IncludeDirectories test to cover this case. Reported-by: Christophe Giboudeaux <cgiboudeaux@gmx.com>
* | | | | | Merge topic 'geh-cleanup-identifiers'Brad King2013-05-246-0/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e24997 GenerateExportHeader: Generate only C identifiers as defines
| * | | | | | GenerateExportHeader: Generate only C identifiers as definesStephen Kelly2013-05-246-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables in this module are used to configure a header file with defines whose name depends on the name of the target. As valid names of targets may be invalid for use as defines, convert the names of the defines used to C identifiers first. This is already done in C++ code for the DEFINE_SYMBOL property. This is not as simple as ensuring that the BASE_NAME is a C identifier, because most of the define names are configurable, and because use of a BASE_NAME which is not a C identifier, such as 4square can become a C identifier by specifying a prefix in the generate_export_header macro.
* | | | | | | Merge topic 'geh-MODULE-export'Brad King2013-05-241-5/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ffef50 GenerateExportHeader: Allow use of of this macro with MODULEs.
| * | | | | | | GenerateExportHeader: Allow use of of this macro with MODULEs.Stephen Kelly2013-05-231-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The significant issue with MODULEs is that on Windows, the exported symbols must be dllexported and they are not imported. In other export macro implementations this is done by defining an export macro outside of any ifdef which depends on definitions set on the command line. However, with cmake we already expect the DEFINE_SYMBOL to be defined, so the regular EXPORT macro can be used by such plugins.
* | | | | | | | Merge topic 'geh-add-missing-test'Brad King2013-05-241-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74f24b2 Tests/Module/GenerateExportHeader: Test exported free-function
| * | | | | | | | Tests/Module/GenerateExportHeader: Test exported free-functionStephen Kelly2013-05-241-0/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'geh-output-tweak'Brad King2013-05-241-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb412d0 GenerateExportHeader: Add newlines to separate the compiler output.
| * | | | | | | | | GenerateExportHeader: Add newlines to separate the compiler output.Stephen Kelly2013-05-231-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the error logs more readable.
* | | | | | | | | Merge topic 'language-generator-expressions'Brad King2013-05-2413-8/+200
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3241014 Add $<LINK_LANGUAGE> generator expression
| * | | | | | | | | Add $<LINK_LANGUAGE> generator expressionStephen Kelly2013-05-2413-8/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They can't be used when evaluating link libraries, but they can be used for include directories and compile definitions. Later they can be used for compile options.
* | | | | | | | | | Merge topic 'fix-include_directories-whitespace-handling'Brad King2013-05-241-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a97240b Tests/IncludeDirectories: Avoid shared library with no symbols
| * | | | | | | | | | Tests/IncludeDirectories: Avoid shared library with no symbolsBrad King2013-05-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added a empty_entry_test shared library to the IncludeDirectories test. Some toolchains fail to create a shared library with no user-defined symbols, so provide a dummy symbol.
* | | | | | | | | | | Merge topic 'Memchecker-Mac-fix'Brad King2013-05-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0aed09f Tests: ignore GuardMalloc messages on all Apple build, not just XCode ones
| * | | | | | | | | | | Tests: ignore GuardMalloc messages on all Apple build, not just XCode onesRolf Eike Beer2013-05-231-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-241-1/+1
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge topic 'xcode-attributes-variant'Brad King2013-05-231-2/+33
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 332350b Xcode: Support XCODE_ATTRIBUTE_ with [variant=<config>] (#12532)
| * | | | | | | | | | | Xcode: Support XCODE_ATTRIBUTE_ with [variant=<config>] (#12532)Cédric OCHS2013-05-221-2/+33
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c519bb2b (XCode: Also qoute [] as needed to set build-configurations, 2011-04-05) we escape "[]" conditions for XCODE_ATTRIBUTE_ settings. However, we need to handle the "variant" condition with a special case to map it only into the settings for the matching configuration.
* | | | | | | | | | | Merge topic 'xcode-shared-linker-flags-per-config'Brad King2013-05-231-17/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bcda47d Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)
| * | | | | | | | | | Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)Matthew Bentham2013-05-221-17/+13
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor lookup of CMAKE_(EXE|MODULE|SHARED)_LINKER_FLAGS(|_<CONFIG>) variables to ensure all combinations are handled. Use the helper method AddConfigVariableFlags to simplify the implementation.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-231-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'join-genex'Brad King2013-05-227-51/+145
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7ba452 Add the JOIN generator expression. 96ec314 Make it possible for any genex to have arbitrary content at the end. bd638ee Rename the method determining if a genex accepts arbitrary content. dc742fe Extract the ProcessArbitraryContent method.
| * | | | | | | | Add the JOIN generator expression.Stephen Kelly2013-05-166-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator expression joins a list with a separator. The separator may contain arbitrary content, such as commas, which is ordinarily a delimiter in the generator expression syntax.
| * | | | | | | | Make it possible for any genex to have arbitrary content at the end.Stephen Kelly2013-05-161-1/+14
| | | | | | | | |
| * | | | | | | | Rename the method determining if a genex accepts arbitrary content.Stephen Kelly2013-05-161-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The meaning of this will be expanded to generator expressions with more than a single parameter.
| * | | | | | | | Extract the ProcessArbitraryContent method.Stephen Kelly2013-05-162-41/+62
| | | | | | | | |
* | | | | | | | | Merge topic 'LinkLine-typedef'Brad King2013-05-221-2/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 776225d cmTarget: drop the unused local typedef LinkLine
| * | | | | | | | | cmTarget: drop the unused local typedef LinkLineRolf Eike Beer2013-05-221-2/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'wizard-cleanup'Brad King2013-05-221-7/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eca523f wizard: simplify control flow f1d27bf wizard: fix warnings
| * | | | | | | | | wizard: simplify control flowRolf Eike Beer2013-05-221-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking if a byte is 0 before checking it for something else doesn't do anything useful. Also one can be sure that it can't be anything wanted if the value was set to 0 immediately before.
generated by cgit v0.12 at 2025-02-04 14:51:57 (GMT)