summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Make cmcldeps depfile output more consistent with 'ninja -t msvc'Reid Kleckner2013-07-261-9/+24
| | | | | | | Ninja relies on the generator to produce paths that match up with the paths used in the build.ninja file, which are spelled with backslashes. Therefore, cmcldeps should canonicalize depfile paths to use backslashes and relativize paths to the build directory.
* CMake Nightly Date StampKitware Robot2013-07-231-1/+1
|
* Merge topic 'AddCommentsToExportsFile'Brad King2013-07-221-1/+3
|\ | | | | | | | | 4b1919f ExportTargets: add one more comment to the generated file.
| * ExportTargets: add one more comment to the generated file.Alex Neundorf2013-07-191-1/+3
| | | | | | | | | | | | | | | | This patch adds a comment above the block which protects the exported targets file against multiple inclusion, to make the file easier to understand for readers. Alex
* | Merge topic 'rpath-on-mac'Brad King2013-07-224-21/+35
|\ \ | | | | | | | | | | | | | | | 603bc59 OS X: Fix regression handling frameworks for Ninja e645ff0 OS X: Enable rpath support on Mac OS X when find_library() is used.
| * | OS X: Fix regression handling frameworks for NinjaClinton Stimpson2013-07-222-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression created by commit 373faae5 (Refactor how bundles and frameworks are supported, 2013-05-05). Since the ninja file isn't aware of how framework symlinks work, we suppress symlink creation and let cmOSXBundleGenerator handle it. Also, use the real name of framework library in build rules as was done before, instead of the symlink.
| * | OS X: Enable rpath support on Mac OS X when find_library() is used.Clinton Stimpson2013-07-162-18/+24
| | |
* | | Merge topic 'cpack-wix'Brad King2013-07-222-13/+134
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf23891 CPackWIX: Add support for custom WiX templates 155bb01 CMakeCPack: Provide an upgrade guid for WiX bfa2e29 CPackWIX: Add option to specify the language(s) of the installer 6e51ea9 CPackWIX: Handle multiple shortcuts in the start menu 6d77e1a CPackWIX: Fix MSI package layout regression from parent 8c0e325 CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)
| * | | CPackWIX: Add support for custom WiX templatesAdam J. Weigold2013-07-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WiX provides a lot of functionality for installers that cannot be supported (easily) in the default WIX.template.in file. For most users, the default template should be fine. However if users want to produce merge modules, include custom actions, etc, this new option allows for a hook into how the wxs is produced.
| * | | CPackWIX: Add option to specify the language(s) of the installerRichard Ulrich2013-07-191-0/+5
| | | | | | | | | | | | | | | | Add option "CPACK_WIX_CULTURES".
| * | | CPackWIX: Handle multiple shortcuts in the start menuRichard Ulrich2013-07-191-7/+13
| | | |
| * | | CPackWIX: Fix MSI package layout regression from parentIan Monroe2013-07-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added a regression where if the install directory had: parent child A child B the produced MSI would install: parent child A child B
| * | | CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)Fredrik Axelsson2013-07-192-10/+120
| | | | | | | | | | | | | | | | | | | | Add start menu items including an uninstall shortcut. Add variable CPACK_WIX_PROGRAM_MENU_FOLDER to configure folder name.
* | | | CMake Nightly Date StampKitware Robot2013-07-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-07-211-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-07-201-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2013-07-191-1/+1
| | |
* | | Merge topic 'custom-command-assignment'Brad King2013-07-182-0/+29
|\ \ \ | | | | | | | | | | | | | | | | 17c841c add_custom_command: Manage backtrace memory correctly (#14299)
| * | | add_custom_command: Manage backtrace memory correctly (#14299)Brad King2013-07-172-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an assignment operator to cmCustomCommand to copy the Backtrace member pointee and avoid multiple-free on destruction. Reported-by: Vitezslav Cizek <vcizek@suse.cz>
* | | | Merge topic 'doc-add_test-names'Brad King2013-07-181-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d017058 add_test: Document test name restrictions (#14298)
| * | | | add_test: Document test name restrictions (#14298)Brad King2013-07-171-0/+3
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-181-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-171-1/+1
|/ / / /
* | | | Merge topic 'drop-old-vs-dependency'Brad King2013-07-166-25/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4bb6e24 VS,Xcode: Drop incorrect legacy dependency trace (#14291)
| * | | | VS,Xcode: Drop incorrect legacy dependency trace (#14291)Brad King2013-07-156-25/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the "vsProjectFile" argument from cmTarget::TraceDependencies. It appears to be the modern equivalent to a hunk added in commit ba68f771 (...added new custom command support, 2003-06-03): + name = libName; + name += ".dsp.cmake"; + srcFilesToProcess.push(name); but was broken by refactoring at some point. The current behavior tries to trace dependencies on a source file named the same as a target, which makes no sense. Furthermore, in code of the form add_executable(foo foo.c) add_custom_command(OUTPUT "${somewhere}/foo" ... DEPENDS foo) the "vsProjectFile" value "foo" matches source "${somewhere}/foo.rule" generated to hold the custom command and causes the command to be added to the "foo" target incorrectly. Simply drop the incorrect source file trace and supporting logic.
* | | | | Merge topic 'cppcheck-fixes'Brad King2013-07-162-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a20c819 cmake: Fix resource leak reported by cppcheck c8adab9 cmcurl: Fix resource leak reported by cppcheck 499531c libarchive: Fix free() order to avoid accessing freed memory 3b849a7 ccmake: Add missing initializers reported by cppcheck
| * | | | | cmake: Fix resource leak reported by cppcheckBrad King2013-07-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return early in cmake::ReportUndefinedPropertyAccesses if there is no global generator instead of opening a file and leaking the descriptor. Reported-by: Ömer Fadıl USTA <omerusta@gmail.com>
| * | | | | ccmake: Add missing initializers reported by cppcheckÖmer Fadıl USTA2013-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return statement uses d1, d2, d3, and d4 variables but the code which initialize them inside a if statement and not always this if statement is corrent. On the other hand these variables are using for return statement and needed to be initialized. A trivial fix to pervent some compilers will give build error. Reviewed-by: Igor Murzov <e-mail@date.by>
* | | | | | Merge topic 'vs-no-indirect-output'Brad King2013-07-161-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45d2966 VS: Avoid leaking child process output back to IDE (#14266)
| * | | | | | VS: Avoid leaking child process output back to IDE (#14266)Brad King2013-07-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS IDE sets the environment variable VS_UNICODE_OUTPUT when executing build rules in order to tell MS tools to report output through a back door instead of through stdout/stderr. Unset this variable so that CMake can capture or properly redirect all output from processes it runs even when running inside a VS IDE build environment. This generalizes the special cases fixed by commit 80d045b0 (When GetPrerequisites.cmake runs dumpbin while running inside the VS IDE..., 2008-05-01) and commit 44aff73d (ExternalProject: Avoid bleed-through output when logging, 2011-01-06), so drop special handling of VS_UNICODE_OUTPUT in those instances.
* | | | | | | Merge topic 'tid-system-argument'Brad King2013-07-1625-58/+284
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cf3547 Add the INTERFACE_SYSTEM_INCLUDE_DIRECTORIES target property. 1925cff Add a SYSTEM parameter to target_include_directories (#14180) 286f227 Extend the cmTargetPropCommandBase interface property handling. 83498d4 Store system include directories in the cmTarget. f1fcbe3 Add Target API to determine if an include is a system include. 2679a34 Remove unused variable.
| * | | | | | | Add the INTERFACE_SYSTEM_INCLUDE_DIRECTORIES target property.Stephen Kelly2013-07-1611-14/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike other target properties, this does not have a corresponding non-INTERFACE variant. This allows propagation of system attribute on include directories from link dependents.
| * | | | | | | Add a SYSTEM parameter to target_include_directories (#14180)Stephen Kelly2013-07-028-21/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to the include_directories(SYSTEM) signature in that it allows telling the compiler to ignore warnings from such headers.
| * | | | | | | Extend the cmTargetPropCommandBase interface property handling.Stephen Kelly2013-07-022-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to handle INTERFACE SYSTEM include directories in particular.
| * | | | | | | Store system include directories in the cmTarget.Stephen Kelly2013-07-025-19/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entries from the cmMakefile are processed and maintained similarly to other include directories. The include_directories(SYSTEM) signature affects all following targets, and all prior targets in the same makefile.
| * | | | | | | Add Target API to determine if an include is a system include.Stephen Kelly2013-07-028-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation can be modified later so that system includes can be determined on a per-target basis.
| * | | | | | | Remove unused variable.Stephen Kelly2013-07-021-1/+0
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-07-161-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'doc-deprecation-variables'Brad King2013-07-151-0/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c64326b Document some variables for deprecation control.
| * | | | | | | Document some variables for deprecation control.Stephen Kelly2013-07-111-0/+24
| | | | | | | |
* | | | | | | | Merge topic 'compile-defs-debugging'Brad King2013-07-1519-110/+293
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7dd010 Add target property debugging for COMPILE_DEFINITIONS 1841215 Refactor cmTarget::GetCompileDefinitions to use an out-vector, not a string. afc9243 Add an overload of cmIDEOptions::AddDefines taking a vector of strings. d95651e Overload cmLocalGenerator::AppendDefines to add a list.
| * | | | | | | | Add target property debugging for COMPILE_DEFINITIONSStephen Kelly2013-07-125-66/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use constructs similar to those for COMPILE_OPTIONS. This is a little different because there is a command to remove_definitions(), so we can't populate the equivalent target property until generate-time in cmGlobalGenerator.
| * | | | | | | | Refactor cmTarget::GetCompileDefinitions to use an out-vector, not a string.Stephen Kelly2013-07-1114-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor to create AddCompileDefinitions.
| * | | | | | | | Add an overload of cmIDEOptions::AddDefines taking a vector of strings.Stephen Kelly2013-07-102-0/+6
| | | | | | | | |
| * | | | | | | | Overload cmLocalGenerator::AppendDefines to add a list.Stephen Kelly2013-07-102-0/+9
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'revert-CMAKE_SYSROOT'Brad King2013-07-159-135/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0416c94 Revert "Use --sysroot when cross compiling."
| * | | | | | | | Revert "Use --sysroot when cross compiling."Stephen Kelly2013-07-129-135/+9
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit de4da665d3205afa239749c41513a315c3831f51. This feature is not yet ready for release. It needs to be merged with the CMAKE_OSX_SYSROOT feature.
* | | | | | | | Merge topic 'update-kwsys'Brad King2013-07-151-8/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 635e19d Merge branch 'upstream-kwsys' into update-kwsys 0a44fa4 KWSys 2013-07-10 (beef6819)
| * | | | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-07-111-8/+4
| |/ / / / / / /
* | | | | | | | Merge topic 'target-policies'Brad King2013-07-153-60/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 484bb88 Genex: Make CMP0021 and CMP0022 usable with TARGET_POLICY