summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* variable_watch: Add a deleter for the client dataBen Boeckel2013-08-082-3/+14
| | | | | | The client data is arbitrary and the callback may be called an unspecified number of times, so the cmVariableWatch must be the one to delete the client data in the end (if it is needed at all).
* variable_watch: Store client data as pointersBen Boeckel2013-08-082-7/+22
| | | | | The STL containers create extra copies which makes keeping track of the owner of the client data much messier.
* Merge topic 'vs10-include-dir-ampersand'Brad King2013-08-021-1/+1
|\ | | | | | | | | e7bcdf8 VS10: Escape include paths in XML project files (#14331)
| * VS10: Escape include paths in XML project files (#14331)Brad King2013-08-011-1/+1
| | | | | | | | | | | | Fix generation of the AdditionalIncludeDirectories element content to escape for XML syntax. We already escape content of other elements, this one was simply missing by accident.
* | Merge topic 'FindGTK2-pango-libs'Brad King2013-08-021-1/+5
|\ \ | | | | | | | | | | | | 73ba4e5 FindGTK2: Detect pangoft2 and pangoxft libraries
| * | FindGTK2: Detect pangoft2 and pangoxft librariesDaniele E. Domenichelli2013-08-011-1/+5
| |/
* | CMake Nightly Date StampKitware Robot2013-08-021-1/+1
|/
* Merge topic 'INCLUDES-DESTINATION-no-config'Brad King2013-08-017-16/+78
|\ | | | | | | | | | | 80e652f Export: Process generator expressions from INCLUDES DESTINATION. 4355815 cmTarget: Add NAME property
| * Export: Process generator expressions from INCLUDES DESTINATION.Stephen Kelly2013-07-316-15/+54
| | | | | | | | Configuration sensitive expressions are not permitted.
| * cmTarget: Add NAME propertyStephen Kelly2013-07-311-1/+24
| | | | | | | | | | In generator expression contexts, this can be used to determine the name of the head target in the evaluation.
* | Merge topic 'FindGTK2-gmodule'Brad King2013-08-011-1/+3
|\ \ | | | | | | | | | | | | | | | 7ca5958 FindGTK2: Detect gmodule library 76c72b9 FindGTK2: gthread-2.0 folder does not exist
| * | FindGTK2: Detect gmodule libraryDaniele E. Domenichelli2013-07-311-0/+3
| | |
| * | FindGTK2: gthread-2.0 folder does not existDaniele E. Domenichelli2013-07-311-1/+0
| |/ | | | | | | Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
* | Merge topic 'minor-cleanups'Brad King2013-08-011-2/+1
|\ \ | | | | | | | | | | | | 7429941 Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIES
| * | Docs: Fix typo in CMAKE_DEBUG_TARGET_PROPERTIESStephen Kelly2013-07-311-2/+1
| |/ | | | | | | | | Introduced in commit f10e6480 (Docs: Document existing target property debugging options., 2013-07-26)
* | Merge topic 'vs-subsystem-order'Brad King2013-08-011-2/+2
|\ \ | | | | | | | | | | | | b64e8f2 VS10: Honor user-specified /SUBSYSTEM: flag (#14326)
| * | VS10: Honor user-specified /SUBSYSTEM: flag (#14326)Brad King2013-07-311-2/+2
| |/ | | | | | | | | | | Use the WIN32_EXECUTABLE target property only to set the SubSystem build attribute default. When user-specified flags are later parsed they may then override it.
* | Merge topic 'target-command-allow-no-items'Brad King2013-08-014-3/+27
|\ \ | | | | | | | | | | | | c0b8682 Allow target commands to be invoked with no items (#14325).
| * | Allow target commands to be invoked with no items (#14325).Stephen Kelly2013-07-314-3/+27
| |/ | | | | | | | | | | | | | | Code such as target_include_directories(foo PRIVATE ${items}) should not work or break based on whether items is defined or not.
* | CMake Nightly Date StampKitware Robot2013-08-011-1/+1
|/
* Merge topic 'update-libarchive'Brad King2013-07-31152-4132/+18206
|\ | | | | | | | | | | | | | | | | | | | | | | 26fe7e3 libarchive: Backport to CMake 2.8.2 b81a4e1 libarchive: Remove build options not used by CMake 3218f52 libarchive: Avoid struct init with variable bae3a73 libarchive: Silence API deprecation warnings 6773840 libarchive: Include cm_zlib.h to get zlib used by CMake 8dc0a9f libarchive: Update README-CMake.txt for new snapshot 102071f Merge branch 'libarchive-upstream' into update-libarchive 35df7c8 libarchive 3.1.2 (reduced)
| * libarchive: Backport to CMake 2.8.2Brad King2013-07-313-223/+12
| | | | | | | | | | | | | | Avoid requiring CMake 2.8.6 for CMakePushCheckState or CMake 2.8.8 for CMakeExpandImportedTargets. Drop the custom versions of CMake modules CheckCSource(Compiles|Runs) because we do not use the SAFESEH option anyway.
| * libarchive: Remove build options not used by CMakeBrad King2013-07-311-122/+0
| | | | | | | | | | Drop options POSIX_REGEX_LIB and ENABLE_SAFESEH that we do not want for the CMake build of libarchive.
| * libarchive: Avoid struct init with variableBrad King2013-07-311-1/+3
| | | | | | | | | | Compilers such as Borland and MIPSpro do not like struct initialization with variables. Initialize using assignment instead.
| * libarchive: Silence API deprecation warningsBrad King2013-07-311-5/+2
| | | | | | | | CMake uses old libarchive APIs for now.
| * libarchive: Include cm_zlib.h to get zlib used by CMakeBrad King2013-07-312-2/+2
| | | | | | | | | | | | Follow up change from commit ffa6faa4 (libarchive: Include cm_zlib.h to get zlib used by CMake, 2011-12-20) for new includes of zlib.h in updated libarchive.
| * libarchive: Update README-CMake.txt for new snapshotBrad King2013-07-311-4/+4
| |
| * Merge branch 'libarchive-upstream' into update-libarchiveBrad King2013-07-31153-4135/+18543
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive.h Utilities/cmlibarchive/libarchive/archive_entry.h Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c Utilities/cmlibarchive/libarchive/archive_windows.h Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
| | * libarchive 3.1.2 (reduced)LibArchive Upstream2013-07-26154-4181/+18777
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream libarchive using the following shell code. url=git://github.com/libarchive/libarchive.git && v=3.1.2 && r=19f23e19 && paths=" CMakeLists.txt COPYING CTestConfig.cmake build/cmake build/pkgconfig build/utils build/version libarchive/*.* " && mkdir libarchive-$v-g$r-reduced && git clone $url libarchive-git && date=$(cd libarchive-git && git log -n 1 --format='%cd' $r) && (cd libarchive-git && git archive --format=tar $r -- $paths) | (cd libarchive-$v-g$r-reduced && tar xv) && fromdos libarchive-$v-g$r-reduced/build/cmake/Find*.cmake && echo "g$r date: $date"
* | | Merge topic 'static_library_flags'Brad King2013-07-3113-100/+223
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33e6e0b VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variables 152dfda Add additonal tests for the linker flags 20ed496 Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variables 54f7019 Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageInclude 2a43c30 Add support for CMAKE_STATIC_LINKER_FLAGS 14bbf83 Unify the way the flags of a static library are read
| * | | VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variablesPatrick Gansterer2013-07-311-6/+30
| | | | | | | | | | | | | | | | | | | | Read the content of the config specific linker flags in the Visual Studio 6 generator too.
| * | | Add additonal tests for the linker flagsPatrick Gansterer2013-07-314-2/+43
| | | | | | | | | | | | | | | | | | | | Extend Tests/LinkFlags to test libraries of the type MODULE and the content of the CMAKE_*_LINKER_FLAGS_* variables.
| * | | Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variablesPatrick Gansterer2013-07-311-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | Add CMAKE_MODULE_LINKER_FLAGS_*, CMAKE_SHARED_LINKER_FLAGS_* and CMAKE_STATIC_LINKER_FLAGS_* to cmDocumentVariables.cxx with a similar documentation as CMAKE_EXE_LINKER_FLAGS_*.
| * | | Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageIncludePatrick Gansterer2013-07-311-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | Add support for CMAKE_STATIC_LINKER_FLAGS_* to CMakeCommonLanguageInclude.cmake to set the defaults similar to the other CMAKE_*_LINKER_FLAGS_*.
| * | | Add support for CMAKE_STATIC_LINKER_FLAGSPatrick Gansterer2013-07-312-32/+40
| | | | | | | | | | | | | | | | | | | | Add the content of this variable to the target specific linker flags as we do with the other CMAKE_*_LINKER_FLAGS variables already.
| * | | Unify the way the flags of a static library are readPatrick Gansterer2013-07-316-60/+45
| | | | | | | | | | | | | | | | | | | | Introduce cmLocalGenerator::GetStaticLibraryFlags() to have a central function for getting the linker flags for a given target.
* | | | Merge topic '13582_configured_file_regeneration'Brad King2013-07-311-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8fbf39a cmMakefile: Do not track configured files known to be temporary
| * | | | cmMakefile: Do not track configured files known to be temporaryBrad King2013-07-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ad502502 (cmMakefile: Track configured files so we can regenerate them, 2013-06-18) cmMakefile::ConfigureFile records the configured file as an output file generated by CMake. The intention is that for make and ninja we can re-run CMake when one of the files it generates goes missing. However, files configured temporarily in CMakeTmp directories by Check* modules do not live past the CMake invocation. Teach cmMakefile::ConfigureFile to skip tracking files with "CMakeTmp" in their path, just like cmCoreTryCompile::TryCompileCode does to avoid adding dependencies on temporary source files. In the future we will need a more general filter to avoid recording as CMake outputs any files that do not exist at the end of generation.
* | | | | Merge topic 'ninja_bad_cmcldeps_paths'Brad King2013-07-311-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d12459f VS 6: Tell BuildDepends test to tolerate ninjadep failure
| * | | | | VS 6: Tell BuildDepends test to tolerate ninjadep failureBrad King2013-07-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS 6 IDE does not want to recompile a particular source after a particular header it includes is modified, even by hand. For now just silence the failure and document it with a comment.
* | | | | | Merge topic 'bash-completion-updates'Brad King2013-07-313-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f85f6a5 bash-completion: Fix/improve generator names extraction 351fd63 bash-completion: Add -S,-SP options arguments completion
| * | | | | | bash-completion: Fix/improve generator names extractionIgor Murzov2013-07-292-5/+7
| | | | | | |
| * | | | | | bash-completion: Add -S,-SP options arguments completionIgor Murzov2013-07-291-1/+1
| | | | | | |
* | | | | | | Merge topic 'install-interface-includes'Brad King2013-07-315-17/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72d13ff install: Remove error condition using INCLUDES DESTINATION without EXPORT.
| * | | | | | | install: Remove error condition using INCLUDES DESTINATION without EXPORT.Stephen Kelly2013-07-295-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 650e61f8 (Add a convenient way to add the includes install dir to the INTERFACE., 2013-01-05) introduced an error case for using the install(TARGETS) command with specified INCLUDES DESTINATION, but no specified EXPORT set. It is convenient to use a variable to set the various destinations for different outputs (as KDE does), and some targets such as executables are installed but not exported. This was triggering the error case, but as it is a common case, remove the error.
* | | | | | | | Merge topic 'add-cmake_reset_check_state'Brad King2013-07-311-5/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9349d69 Add cmake_reset_check_state() macro
| * | | | | | | | Add cmake_reset_check_state() macroVadim Zhukov2013-07-311-5/+28
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's acknowledged that check state should not generally nest, so it should be cleared when used, for example, in Find* module. Also, add optional RESET argument to cmake_push_check_state().
* | | | | | | | Merge topic 'passthru'Brad King2013-07-313-5/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b473d2 Add option to use stdout/stderr of original terminal in cmake --build
| * | | | | | | | Add option to use stdout/stderr of original terminal in cmake --buildPatrick Gansterer2013-07-293-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the original file handles to the native tool when using the --use-stderr option in the build command. This enables the usage of advanced terminal features like colored output.
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-07-311-1/+1
| | | | | | | | |
generated by cgit v0.12 at 2024-11-14 17:40:04 (GMT)