summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'list-empty-error'David Cole2012-04-2513-1/+44
|\ | | | | | | | | 05604eb list: Handle errors on empty lists more gracefully (#13138)
| * list: Handle errors on empty lists more gracefully (#13138)Brad King2012-04-1713-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | Since commit ed1ea24c (Fix INSERT to allow inserting to empty list, 2006-05-15) the list command allows insertion into an empty list at index 0. Fix rejection of insertion at non-zero (negative) indices to present an error message instead of crashing. While at it, fix the error message of the GET and REMOVE_AT operations when the list is empty to not present a bogus allowed range. Add a "RunCMake.list" test to cover failure cases on empty lists.
* | Merge topic 'test-RunCMake-check'David Cole2012-04-252-9/+19
|\ \ | | | | | | | | | | | | 38c3943 Teach RunCMake tests to allow custom checks
| * | Teach RunCMake tests to allow custom checksBrad King2012-04-192-9/+19
| | | | | | | | | | | | | | | | | | Look for a <SubTest>-check.cmake script and load it to check side effects of the sub test. Provide it with the test source and build tree paths in variables. Check for a failure message in a result variable.
* | | Merge topic 'doc-find_package-variables'David Cole2012-04-251-3/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | 5ed93db find_package: Fix components signature documentation (#13142) 6c12e82 find_package: Document <package>_FIND_* variables (#13142)
| * | | find_package: Fix components signature documentation (#13142)Brad King2012-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | Update the signature notation to show that "REQUIRED COMPONENTS ..." is allowed and that REQUIRED is an option on its own.
| * | | find_package: Document <package>_FIND_* variables (#13142)Brad King2012-04-181-0/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | When loading a find module or package config file the find_package command defines several variables to provide information about the caller's request. Previously this was documented only in the Modules/readme.txt file which is not distributed. Document the behavior explicitly in the main find_package documentation.
* | | Merge topic 'vs10-rule-files'David Cole2012-04-259-52/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 72333a4 VS10: Avoid creating .rule files next to outputs (#13141) 369e346 Factor out custom command .rule file path generation f9b758e Cleanup custom command .rule file internal handling
| * | | VS10: Avoid creating .rule files next to outputs (#13141)Brad King2012-04-183-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide custom command .rule files inside the CMakeFiles directory. Ensure a short, deterministic, and unique name by using a hash of the directory path containing the output file. Preserve the file name so the entry in the IDE is human-readable. Clarify the comment that explains why the rule file must be created on disk.
| * | | Factor out custom command .rule file path generationBrad King2012-04-183-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cmGlobalGenerator::GenerateRuleFile to compute a generator-specific rule file location. This will allow specific generators to override the location of .rule files without changing the behavior of other generators.
| * | | Cleanup custom command .rule file internal handlingBrad King2012-04-185-41/+41
| |/ / | | | | | | | | | | | | | | | | | | | | | Teach cmMakefile::AddCustomCommandToOutput to return the cmSourceFile instance to which the custom command is attached. Use the return value instead of separately adding a .rule extension and searching for the source. Mark CMake-generated .rule files explicitly with a property instead of trusting the file extension.
* | | Merge topic 'CPackDeb-fixFakerootOnControl'David Cole2012-04-251-5/+10
|\ \ \ | | | | | | | | | | | | | | | | abc9b32 Use fakeroot for control.tar.gz as well
| * | | Use fakeroot for control.tar.gz as wellEric NOULARD2012-04-171-5/+10
| | | |
* | | | Merge topic 'fix-usejava-typo-13135'David Cole2012-04-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8bdd449 UseJava: fix typo in variable name (#13135)
| * | | | UseJava: fix typo in variable name (#13135)Rolf Eike Beer2012-04-161-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | As Dave Abrahams pointed out CMAKE_CURRENT_SOURCE_PATH is wrong, it's of course CMAKE_CURRENT_SOURCE_DIR. Also wrap the path in quotes so the example would even work if the source path has spaces.
* | | | Merge topic 'ctest_coverage-locale'David Cole2012-04-251-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3247d63 ctest_coverage: Save/restore LC_ALL around gcov (#13136)
| * | | | ctest_coverage: Save/restore LC_ALL around gcov (#13136)Brad King2012-04-161-1/+29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Commit ffbe61bb (make sure english is used for output of gcov, 2008-05-10) taught ctest_coverage to set LC_ALL=POSIX to get English output from gcov. Use the more portable value LC_ALL=C and restore the original value when finished.
* | | | Merge topic 'fix-pkgconfig-13125'David Cole2012-04-252-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3ea850a FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)
| * | | | FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)Rolf Eike Beer2012-04-152-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | The real fix is from Yury G. Kudryashov while I added the surrounding cleanups. An additional hint to really get this fixed came from Rex Dieter.
* | | | | Merge topic 'OBJECTLibrariesInCodeBlocks'David Cole2012-04-252-2/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38d4c1e CodeBlocks: improve support for OBJECT libraries d2ed3c7 -fix #13081: support OBJECT libraries in CodeBlocks/QtCreator projects
| * | | | | CodeBlocks: improve support for OBJECT librariesAlex Neundorf2012-04-092-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit creates a dummy text file for each OBJECT library for the CodeBlocks generator, so the generated project file can reference a unique file for each target. Most probably these files are unused. Alex
| * | | | | -fix #13081: support OBJECT libraries in CodeBlocks/QtCreator projectsAlex Neundorf2012-03-311-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | Merge topic 'doc-target_link_libraries-repeat'David Cole2012-04-251-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ebf39cd Document behavior of multiple target_link_libraries calls (#13113)
| * | | | | | Document behavior of multiple target_link_libraries calls (#13113)Brad King2012-04-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | State explicitly that multiple calls append (rather than replace).
* | | | | | | Merge topic 'ninja-patches'David Cole2012-04-254-13/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9747f3 Ninja: CMAKE_USE_NINJA is the name of the macro 2a081a2 Ninja: no additional variable needed to enable ninja b8c3e8c Ninja: enable Ninja for CodeBlocks 11bd9b5 Ninja: remove GCC -Wshadow warning f93e818 Ninja: add option to enable ninja where it is not enabled by default 73426ac Ninja: no 16:9 screens for the cmake team ;) 8217c26 Ninja: ensure output directories exist
| * | | | | | | Ninja: CMAKE_USE_NINJA is the name of the macroPeter Kuemmel2012-04-081-1/+1
| | | | | | | |
| * | | | | | | Ninja: no additional variable needed to enable ninjaPeter Kuemmel2012-04-081-7/+5
| | | | | | | |
| * | | | | | | Ninja: enable Ninja for CodeBlocksPeter Kuemmel2012-04-071-0/+3
| | | | | | | |
| * | | | | | | Ninja: remove GCC -Wshadow warningPeter Kuemmel2012-04-071-1/+1
| | | | | | | |
| * | | | | | | Ninja: add option to enable ninja where it is not enabled by defaultPeter Kuemmel2012-04-061-6/+8
| | | | | | | |
| * | | | | | | Ninja: no 16:9 screens for the cmake team ;)Peter Kuemmel2012-04-061-3/+6
| | | | | | | |
| * | | | | | | Ninja: ensure output directories existPeter Kuemmel2012-04-062-6/+25
| | | | | | | |
* | | | | | | | Merge topic 'dev/fix-python3-findmodule'David Cole2012-04-251-4/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bdec58 Search for other ABIFLAGS builds of Python 6a46f5c Don't put legacy variables back into the cache
| * | | | | | | | Search for other ABIFLAGS builds of PythonBen Boeckel2012-03-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Python3, standard Python installs may have additional ABI flags attached to include directories and library names. As of 3.2, the following flags are in the configure file: d -> --with-debug m -> --with-pymalloc u -> --with-wide-unicode Python 3.3 seems to no longer have --with-wide-unicode. Hopefully Python will ensure that the possible flags always show up in a stable order. The 'd' flag is ignored since the debug library is considered separate. There is still the problem where ABI flags cannot be specified in find_package since the letters confuse the version comparator.
| * | | | | | | | Don't put legacy variables back into the cacheBen Boeckel2012-03-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If PYTHON_INCLUDE_PATH is put into the cache, then it will always override whatever might be found and PYTHON_INCLUDE_DIR is never given a chance to find something different. It being marked as INTERNAL also means that it cannot be changed without editing CMakeCache.txt directly. Basically, the scenario is that if the Python version is changed, then deleting PYTHON_INCLUDE_DIR doesn't work because any cached PYTHON_INCLUDE_PATH variable is set before find_path is even called. Any build tree using a previous version will still need either manual removal of PYTHON_INCLUDE_PATH or a complete reconfigure, but in the future changing the Python version can be accomplished by deleting PYTHON_INCLUDE_DIR and reconfiguring with the new version.
* | | | | | | | | Merge topic 'mac_environ'David Cole2012-04-251-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a90d478 [OSX] Fixed undefined symbol when linking CMakeLib into shared library
| * | | | | | | | | [OSX] Fixed undefined symbol when linking CMakeLib into shared libraryKonstantin Tokarev2012-03-031-0/+3
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2012-04-251-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2012-04-241-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2012-04-231-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2012-04-221-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2012-04-211-1/+1
| | | | | | | | | |
* | | | | | | | | | Refactor CMake version handlingBrad King2012-04-204-27/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the CMake version number components out of "CMakeLists.txt" into dedicated file "Source/CMakeVersion.cmake". Set the TWEAK level to the date explicitly. Add a "Source/CMakeVersion.bash" script to update the date, thus replacing KWSys DateStamp for CMake. Teach the bootstrap script to extract the version components from their new location.
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-04-201-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'developer-setup'Brad King2012-04-1914-0/+803
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Exclude from CMake source archives files specific to Git work treeBrad King2012-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "export-ignore" attribute to SetupForDevelopment.sh and the Git/ hooks directory.
| * | | | | | | | | | Merge branch 'setup' into developer-setupBrad King2012-03-022-7/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Exclude from source archives files specific to Git work treeBrad King2012-03-022-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the "export-ignore" attribute to all such files. Remove the suggestion from the README since this should not be a responsibility of the including project.
| * | | | | | | | | | | Add and configure developer setup helper scriptsBrad King2012-03-022-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure GitSetup scripts for CMake. Run them from a single Utilities/SetupForDevelopment.sh script.
| * | | | | | | | | | | Merge branch 'setup' into developer-setupBrad King2012-03-0211-0/+783
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Utilities/GitSetup/ directory using subtree merge from the general GitSetup repository "setup" branch.