summaryrefslogtreecommitdiff
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into vs12-generatorBrad King2013-06-28157-1357/+5389
|\ | | | | | | | | Resolve conflicts in Tests/Preprocess/CMakeLists.txt by keeping the side from 'master'.
| * Merge topic 'refactor-compile-options'Brad King2013-06-2812-174/+88
| |\ | | | | | | | | | | | | | | | | | | d221eac Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handling b6385ca Escape target flags taken from COMPILE_OPTIONS 0c9cc9a Embarcadero: Use response files only for includes, objects, and libs
| | * Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handlingBrad King2013-06-279-171/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the cmLocalGenerator GetCompileOptions method with an AddCompileOptions method since all call sites of the former simply append the result to a flags string anyway. Add a "lang" argument to AddCompileOptions and move the CMAKE_<LANG>_FLAGS_REGEX filter into it. Move the call sites in each generator to a location that has both the language and configuration available. In the Makefile generator this also moves the flags from build.make to flags.make where they belong.
| | * Escape target flags taken from COMPILE_OPTIONSBrad King2013-06-275-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor appending of individual flags out into an AppendFlagEscape method in cmLocalGenerator and teach it to use EscapeForShell. Update all COMPILE_OPTIONS handling to use AppendFlagEscape. Override the method in the Xcode generator to use its custom escape implementation. Teach the CompileOptions test to add an option that requires escaping everywhere instead of just with the GNU tools.
| * | Merge topic 'update-kwsys'Brad King2013-06-281-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | 063617c Merge branch 'upstream-kwsys' into update-kwsys 045fc84 KWSys 2013-06-24 (3d1d4e7c)
| | * | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-06-261-1/+1
| | | |
| * | | Merge topic 'doc-ENV-syntax'Brad King2013-06-281-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | c293e05 Document ENV syntax as a "variable" (#14245)
| | * | | Document ENV syntax as a "variable" (#14245)Brad King2013-06-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Although "ENV" is not a special variable itself, use it to document the $ENV{VAR} syntax.
| * | | | CMake Nightly Date StampKitware Robot2013-06-281-1/+1
| | |_|/ | |/| |
| * | | CMake Nightly Date StampKitware Robot2013-06-271-1/+1
| | |/ | |/|
| * | Merge topic 'dag-LINKER_LANGUAGE'Brad King2013-06-263-4/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff015ee Genex: Report error if a target file is needed to evaluate link libraries. b58aff9 Genex: Extend EvaluatingLinkLibraries to also check the top target name. b1c19ce Genex: Make LINK_LANGUAGE report an error when evaluating link libraries. 0e1cb07 Add missing return after error report.
| | * | Genex: Report error if a target file is needed to evaluate link libraries.Stephen Kelly2013-06-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructs such as target_link_libraries(foo $<$<STREQUAL:$<TARGET_FILE:foo>,foo.so>:bar>) segfault before this patch.
| | * | Genex: Extend EvaluatingLinkLibraries to also check the top target name.Stephen Kelly2013-06-242-2/+8
| | | | | | | | | | | | | | | | | | | | This will allow testing whether we are evaluating the link libraries of a particular target.
| | * | Genex: Make LINK_LANGUAGE report an error when evaluating link libraries.Stephen Kelly2013-06-241-1/+8
| | | |
| | * | Add missing return after error report.Stephen Kelly2013-06-241-0/+1
| | | |
| * | | Merge topic 'version-compare-genex'Brad King2013-06-264-41/+80
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e605528 Add generator expressions for version comparision. 48bb48e De-duplicate version comparison code.
| | * | | Add generator expressions for version comparision.Stephen Kelly2013-06-122-0/+66
| | | | |
| | * | | De-duplicate version comparison code.Stephen Kelly2013-06-122-41/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Extend the VersionCompare in cmSystemTools to handle 8 components, and port the if command to use that.
| * | | | Merge topic 'export-COMPILE_OPTIONS-property'Brad King2013-06-262-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 77ff352 Generate INTERFACE_COMPILE_OPTIONS on export.
| | * | | | Generate INTERFACE_COMPILE_OPTIONS on export.Stephen Kelly2013-06-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missing from commit 80ca9c4b (Add COMPILE_OPTIONS target property., 2013-05-16).
| * | | | | Merge topic 'COMPILER_TARGET'Brad King2013-06-261-0/+14
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 2d9ec1d Add compiler target compile options.
| | * | | | Add compiler target compile options.Stephen Kelly2013-06-111-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For clang, this allows passing -target <triple> to the compiler, and for qcc, -V<arch> using toolchain files containing something like set(triple arm-linux-gnueabihf) set(CMAKE_C_COMPILER "/usr/bin/clang") set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER "/usr/bin/clang++") set(CMAKE_CXX_COMPILER_TARGET ${triple}) or set(arch gcc_ntoarmv7le) set(CMAKE_C_COMPILER /opt/qnx650/host/linux/x86/usr/bin/qcc) set(CMAKE_C_COMPILER_TARGET ${arch}) set(CMAKE_CXX_COMPILER /opt/qnx650/host/linux/x86/usr/bin/QCC) set(CMAKE_CXX_COMPILER_TARGET ${arch}) Both clang and qcc are inherently cross compiler( driver)s.
| * | | | | CMake Nightly Date StampKitware Robot2013-06-261-1/+1
| | | | | |
| * | | | | Merge topic '13582_configured_file_regeneration'Brad King2013-06-252-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad50250 cmMakefile: Track configured files so we can regenerate them (#13582) 4a6397a Ninja: Track configured files so we can regenerate them.
| | * | | | | cmMakefile: Track configured files so we can regenerate them (#13582)Robert Maynard2013-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when a configured file is removed from the build directory, running the build command will not regenerate the file. Now detect this and will rerun cmake properly when a user issues the build command.
| | * | | | | Ninja: Track configured files so we can regenerate them.Robert Maynard2013-06-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the Makefile generator the ninja generator did not tack any of its output files, so if they are deleted the generator would not run.
| * | | | | | Merge topic 'makefile_AddCMakeOutputFile_signature'Brad King2013-06-254-13/+13
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | 6dbd4a5 cmMakefile: Refactor AddCMakeDependFile and AddCMakeOutputFile.
| | * | | | | cmMakefile: Refactor AddCMakeDependFile and AddCMakeOutputFile.Robert Maynard2013-06-244-13/+13
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | AddCMakeDependFile and AddCMakeOutputFile both store as std::string and all calling sites use std::string. So instead of creating more temporary objects, lets just use std::strings.
| * | | | | CMake Nightly Date StampKitware Robot2013-06-251-1/+1
| |/ / / /
| * | | | Merge topic 'config-dependent-CMAKE_AUTOMOC'Brad King2013-06-243-40/+143
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea4d784 QtAutomoc: Use config-dependent compile definitions and includes. 67f6ceb QtAutomoc: Fix handling of list separator for compile definitions.
| | * | | | QtAutomoc: Use config-dependent compile definitions and includes.Stephen Kelly2013-06-123-42/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of always using the includes and defines which are not config-specific, ensure that the config specific ones can be used. Task-number: #13589
| | * | | | QtAutomoc: Fix handling of list separator for compile definitions.Stephen Kelly2013-06-121-1/+3
| | | | | |
| * | | | | Merge topic 'transitive-property-PP-FOR_EACH'Brad King2013-06-244-18/+41
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d8db25 Use a preprocessor loop to manage the valid transitive properties.
| | * | | | | Use a preprocessor loop to manage the valid transitive properties.Stephen Kelly2013-06-104-18/+41
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Hopefully this will prevent regressions when adding further transitive properties in the future.
| * | | | | Merge topic 'find-targets-in-INTERFACE_COMPILE_OPTIONS'Brad King2013-06-241-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | 8a3b5be Find targets in INTERFACE_COMPILE_OPTIONS when exporting for try_compile.
| | * | | | Find targets in INTERFACE_COMPILE_OPTIONS when exporting for try_compile.Stephen Kelly2013-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missing from commit 80ca9c4b (Add COMPILE_OPTIONS target property., 2013-05-16).
| * | | | | Merge topic 'fix-COMPILE_OPTIONS-transitive-performance-regression'Brad King2013-06-241-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | 477e413 Add missing 'seen' check for evaluating COMPILE_OPTIONS.
| | * | | | Add missing 'seen' check for evaluating COMPILE_OPTIONS.Stephen Kelly2013-06-101-1/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 089fe1c1 (Optimize genex evaluation for includes and defines., 2013-02-01) introduced an optimization on DAG processing to not reprocess properties on targets which have already been seen. This was refactored slightly in commit 8dfdf1c7 (Fix the tests for evaluating includes and defines., 2013-02-18), but was not extended to cover COMPILE_OPTIONS in commit 80ca9c4b (Add COMPILE_OPTIONS target property., 2013-05-16). This omission causes the same performance regression in running cmake on LLVM which 089fe1c1 fixed before, but this time for the transitive evaluation of the COMPILE_OPTIONS property.
| * | | | Merge topic 'set-sysroot'Brad King2013-06-249-9/+135
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | de4da66 Use --sysroot when cross compiling.
| | * | | | Use --sysroot when cross compiling.Stephen Kelly2013-06-079-9/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As CMAKE_ROOT_FIND_PATH can be a list, a new CMAKE_SYSROOT is introduced, which is never a list. The contents of this variable is passed to supporting compilers as --sysroot. It is also accounted for when processing implicit link directories reported by the compiler, and when generating RPATH information.
| * | | | | Merge topic 'add-whitespace'Brad King2013-06-2411-21/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2331b57 Add whitespace after colons in error messages.
| | * | | | | Add whitespace after colons in error messages.Stephen Kelly2013-06-2111-21/+22
| | | | | | |
| * | | | | | Merge topic 'openbsd-elf-parsing'Brad King2013-06-242-2/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 480e924 OpenBSD: Enable ELF parsing and editing (#14241)
| | * | | | | | OpenBSD: Enable ELF parsing and editing (#14241)David Coppa2013-06-212-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenBSD provides ELF ABI declarations in #include <stdint.h> #include <elf_abi.h> Teach the platform check and cmELF implementation to use these.
| * | | | | | | Merge topic 'doc-E-tar-zip'Brad King2013-06-241-3/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae06f80 cmake: Document "-E tar" support for .zip (#14225)
| | * | | | | | | cmake: Document "-E tar" support for .zip (#14225)Brad King2013-06-191-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Through use of libarchive internally we support .zip files as well as .tar format. The ExternalProject module makes use of this feature. Document support officially.
| * | | | | | | | Merge topic 'add-cmake_host_system_information-command'Brad King2013-06-243-0/+230
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb71a3a Add cmake_host_system_information command
| | * | | | | | | | Add cmake_host_system_information commandNils Gladitz2013-06-193-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the internal system information API to the CMake language. For example, it is useful to see how much memory the system has available to estimate an upper limit of tests that can run in parallel.
| * | | | | | | | | Merge topic 'add-try_compile-options'Brad King2013-06-242-62/+98
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 482f112 try_compile: Add signature to allow multiple SOURCES
| | * | | | | | | | | try_compile: Add signature to allow multiple SOURCESBrad King2013-06-062-62/+98
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the signature try_compile(RESULT_VAR <bindir> <srcfile> ...) to allow multiple sources as try_compile(RESULT_VAR <bindir> SOURCES <srcfile>... ...) Process the sources to generate a CMakeLists.txt that enables all needed languages. Teach the TryCompile test to try cases with two sources of the same language and of mixed languages. Teach RunCMake.try_compile to cover error cases for the signature.
View Lorry Controller Status