summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS10: Simplify vcxproj.filter file generationBrad King2012-04-272-65/+26
| | | | | | | | | Remove the duplicate source file classification logic used to generate the filter files. Instead record during the main vcxproj file generation the source files generated for each tool. Also record whether or not each source file is converted to a relative path. Use the recorded result during filter generation to ensure consistency between the project file and filter file.
* VS10: Refactor custom commands to use WriteSourceBrad King2012-04-272-14/+20
| | | | | All other source file elements are already written through WriteSource. Refactor custom command source element generation into WriteSource too.
* CMake Nightly Date StampKitware Robot2012-04-261-1/+1
|
* Merge topic 'intel-Windows-EHsc'David Cole2012-04-251-1/+1
|\ | | | | | | | | 4f80896 Intel: On Windows use /EHsc instead of deprecated /GX (#13163)
| * Intel: On Windows use /EHsc instead of deprecated /GX (#13163)Brad King2012-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | Use of the deprecated option with Intel 2011 produces icl: command line remark #10010: option '/GX' is deprecated and will be removed in a future release. See '/help deprecated' so use its replacement option which has been supported for several older versions anyway.
* | Merge topic 'EnhanceBash-completion-part1'David Cole2012-04-257-207/+306
|\ \ | | | | | | | | | | | | | | | 83729f9 Install editors helper files 5b97942 Enhancement of bash completion scripts given by Igor Murzov.
| * | Install editors helper filesEric NOULARD2012-04-231-0/+2
| | |
| * | Enhancement of bash completion scripts given by Igor Murzov.Eric NOULARD2012-04-237-207/+304
| | | | | | | | | | | | | | | | | | | | | The orginal patch has been reworked in order to follow CMake source tree layout habit. Inspired-By: Igor Murzov <e-mail@date.by>
* | | Merge topic 'fix-9946-uninstall-before-install'David Cole2012-04-253-0/+34
|\ \ \ | | | | | | | | | | | | | | | | fe58b67 Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL
| * | | Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALLPatrick Gansterer2012-04-223-0/+34
| |/ / | | | | | | | | | If CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL is set to ON the NSIS installer will look for a previous installed version and ask the user about uninstall.
* | | Merge topic 'fix-ExternalProject-COMMAND-niggly'David Cole2012-04-251-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 64818c1 ExternalProject: Add missing COMMAND keyword
| * | | ExternalProject: Add missing COMMAND keywordDavid Cole2012-04-221-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f67139ae added running a verify script in between running the download and extract scripts. Since then, it has always been missing the COMMAND keyword added in this commit. It worked anyway (semi-accidentally) by running a command line like: cmake -P script1.cmake cmake -P script2.cmake CMake, when running -P scripts on the command line, runs them in order, and apparently ignores spurious arguments in between (the middle "cmake" in the above example) and so, all appeared to work as intended. This commit adds the missing keyword and the commands that run are now two separate sequential cmake invocations like: cmake -P script1.cmake cmake -P script2.cmake ...which was the original intent of commit f67139ae
* | | Merge topic 'fix-13085-add-nsis-preinstall-hook'David Cole2012-04-252-3/+12
|\ \ \ | | | | | | | | | | | | | | | | aa8acea CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)
| * | | CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)David Cole2012-04-212-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows custom NSIS commands to run prior to any installation actions. Projects that need to run an uninstaller first, especially one from a non-NSIS previous revision of a project that is NOW using CPack and NSIS, may do so by putting custom NSIS commands into this variable. Inspired-by: David Golub
* | | | Merge topic 'CPack-fixManPage-typo'David Cole2012-04-251-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 94b24ad Fix CPack RPM man page typo detected by lintian.
| * | | | Fix CPack RPM man page typo detected by lintian.Modestas Vainius2012-04-201-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | | Merge topic 'compile-XL-v6'David Cole2012-04-253-6/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3c7788 Workaround IBM XL v6 streams seekg bug (#13149) 09a91c6 libarchive: Avoid 'inline' keyword on XL C v6 (#13148) a8995eb libarchive: Avoid trailing , in enum for XL v6 (#13148)
| * | | | | Workaround IBM XL v6 streams seekg bug (#13149)Jim Hague2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that file.seekg(0) will, in some circumstances, cause the next file.getline() to omit the first character it reads. Workaround the bug by seeking from ios::beg explicitly.
| * | | | | libarchive: Avoid 'inline' keyword on XL C v6 (#13148)Brad King2012-04-191-0/+3
| | | | | |
| * | | | | libarchive: Avoid trailing , in enum for XL v6 (#13148)Jim Hague2012-04-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | IBM xlc v6 cannot cope with a trailing ',' in enum definitions.
* | | | | | Merge topic 'enhance-include_external_msproject'David Cole2012-04-2520-26/+265
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b803410 VS: Fix line-too-long style errors 8787f94 Merge branch 'list-empty-error' into enhance-include_external_msproject 4a30258 include_external_msproject: Test TYPE, GUID, PLATFORM options (#13120) f3191f5 Merge branch 'test-RunCMake-check' into enhance-include_external_msproject 5913903 include_external_msproject: Add TYPE, GUID, PLATFORM options (#13120)
| * | | | | | VS: Fix line-too-long style errorsBrad King2012-04-194-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 59139031 (include_external_msproject: Add TYPE, GUID, PLATFORM options, 2012-04-16) introduced some long lines. Wrap them.
| * | | | | | Merge branch 'list-empty-error' into enhance-include_external_msprojectBrad King2012-04-1913-1/+44
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict in Tests/RunCMake/CMakeLists.txt by adding both tests.
| * | | | | | | include_external_msproject: Test TYPE, GUID, PLATFORM options (#13120)Brad King2012-04-1911-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "RunCMake.include_external_msproject" test to use the TYPE, GUID, and PLATFORM options to include_external_msproject. Since projects with custom types and platforms cannot be loaded without special VS plugins validate the results by directly parsing the generated solution (.sln). Co-Author: Leonid Yurchenko <nocturne@qarea.com>
| * | | | | | | Merge branch 'test-RunCMake-check' into enhance-include_external_msprojectBrad King2012-04-192-9/+19
| |\ \ \ \ \ \ \
| * | | | | | | | include_external_msproject: Add TYPE, GUID, PLATFORM options (#13120)Leonid Yurchenko2012-04-169-25/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These allow one to reference more external VS project file variations.
* | | | | | | | | 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).
generated by cgit v0.12 at 2025-01-12 05:36:59 (GMT)