summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja_phony_targets'Brad King2013-07-017-130/+280
|\ | | | | | | | | | | | | 539356f Ninja: Custom Command file depends don't need to exist before building 874e171 Ninja: GlobalNinjaGenerator WriteBuild and WritePhonyBuild non static 88d27ad Add a test to expose a bug with add_custom_command and ninja.
| * Ninja: Custom Command file depends don't need to exist before buildingRobert Maynard2013-07-012-3/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When converting custom commands for the ninja build system we need to make sure that any file dependencies that exist in the build tree are converted to phony targets. This tells ninja that these files might not exist when starting the build, but could be generated during the build. This is done by tracking all dependencies for custom command targets. After all have been written out we remove all items from the set that have been seen as a target, custom command output, an alias, or a file in the source directory. Anything that is left is considered to be a file that will be generated as a side effect of another custom command.
| * Ninja: GlobalNinjaGenerator WriteBuild and WritePhonyBuild non staticRobert Maynard2013-07-016-127/+134
| | | | | | | | | | | | To properly track the usage of dependencies that are generated at compile time as the side effect of other build steps we need to make the WriteBuild and WritePhonyBuild commands non static
| * Add a test to expose a bug with add_custom_command and ninja.Robert Maynard2013-06-251-0/+13
| | | | | | | | | | Ninja Generator is unable to handle an add_custom_command having a dependency that is generated at build time by a previous target.
* | Merge topic 'compiler-version-genex'Brad King2013-07-014-1/+130
|\ \ | | | | | | | | | | | | 47a8db5 Add generator expressions for compiler versions.
| * | Add generator expressions for compiler versions.Stephen Kelly2013-06-284-1/+130
| | | | | | | | | | | | | | | New generator expressions allow retrieval of the version per language, as well as equality comparison.
* | | Merge topic 'curl-bug-1192'Brad King2013-07-017-58/+9
|\ \ \ | | | | | | | | | | | | | | | | e643e02 cmcurl: Backport curl bug 1192 fix (#14250)
| * | | cmcurl: Backport curl bug 1192 fix (#14250)Brad King2013-06-277-58/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLVM headers define strlcat as a macro rather than as a function. See upstream Curl issue: http://curl.haxx.se/bug/view.cgi?id=1192 It was addressed by removing use of strlcat altogether. Port the upstream fix to CMake's curl.
* | | | CMake Nightly Date StampKitware Robot2013-07-011-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-06-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-06-291-1/+1
| | | |
* | | | Merge topic 'refactor-compile-options'Brad King2013-06-2815-183/+111
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 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-277-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Embarcadero: Use response files only for includes, objects, and libsBrad King2013-06-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Leave other flags directly in the Makefile command lines and outside any special inline response file syntax. Otherwise Borland does not support flags with quotes in response files.
* | | | 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
| |\ \ \ \
| | * | | | KWSys 2013-06-24 (3d1d4e7c)KWSys Robot2013-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 3d1d4e7c | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' d79a792e..3d1d4e7c Cory Quammen (1): 3d1d4e7c SystemTools: MakeDirectory() reports failure if path is file Change-Id: I080ed62630304c63c65efaf4be08198a6411ae48
* | | | | | 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-2613-4/+65
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-247-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-246-1/+27
| | | | | |
| * | | | | Add missing return after error report.Stephen Kelly2013-06-241-0/+1
| | | | | |
* | | | | | Merge topic 'FindFreetype-gtkmm'Brad King2013-06-261-4/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a34839d FindFreetype: Detect Freetype installed by GtkMM installer for win
| * | | | | | FindFreetype: Detect Freetype installed by GtkMM installer for winDaniele E. Domenichelli2013-06-211-4/+13
| | | | | | |
* | | | | | | Merge topic 'version-compare-genex'Brad King2013-06-266-41/+92
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e605528 Add generator expressions for version comparision. 48bb48e De-duplicate version comparison code.
| * | | | | | | Add generator expressions for version comparision.Stephen Kelly2013-06-124-0/+78
| | | | | | | |
| * | | | | | | 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-265-1/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77ff352 Generate INTERFACE_COMPILE_OPTIONS on export.
| * | | | | | | | Generate INTERFACE_COMPILE_OPTIONS on export.Stephen Kelly2013-06-105-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missing from commit 80ca9c4b (Add COMPILE_OPTIONS target property., 2013-05-16).
* | | | | | | | | Merge topic 'COMPILER_TARGET'Brad King2013-06-264-0/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 2d9ec1d Add compiler target compile options.
| * | | | | | | | Add compiler target compile options.Stephen Kelly2013-06-114-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
generated by cgit v0.12 at 2025-03-01 05:43:48 (GMT)