summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'qt4-setversion-regression-43cb9b8'Brad King2011-03-011-0/+5
|\ | | | | | | | | 6b9bc54 Fix regression in 43cb9b8.
| * Fix regression in 43cb9b8.Clinton Stimpson2011-02-241-0/+5
| | | | | | | | Put back some code for setting the QT_VERSION_* variables that wasn't supposed to be removed.
* | Merge topic 'CPack-ChangeComponentNamingScheme'Brad King2011-03-015-24/+94
|\ \ | | | | | | | | | | | | | | | | | | | | | 3fb89cf CPack remove previously CPack generated files (if any) before running CPack f2ab270 CPack fix KWStyle warning 4deb308 CPack Authorize DISPLAY_NAME usage in component package 8c450f6 CPack remove "-ALL" suffix for ALL-IN-ONE packages
| * | CPack remove previously CPack generated files (if any) before running CPackEric NOULARD2011-02-231-11/+20
| | |
| * | CPack fix KWStyle warningEric NOULARD2011-02-231-1/+1
| | |
| * | CPack Authorize DISPLAY_NAME usage in component packageEric NOULARD2011-02-224-11/+72
| | | | | | | | | | | | Second (last) part fix of feature request #11814
| * | CPack remove "-ALL" suffix for ALL-IN-ONE packagesEric NOULARD2011-02-222-2/+2
| | | | | | | | | | | | First part fix of feature request 11814
* | | Merge topic 'CPackRPM-AvoidSpaceInName-Fixbug9932'Brad King2011-03-011-0/+15
|\ \ \ | | | | | | | | | | | | | | | | 5b4cbdb CPackRPM Replace space in some CPACK_ vars (Fix bug 9932)
| * | | CPackRPM Replace space in some CPACK_ vars (Fix bug 9932)Eric NOULARD2011-02-251-0/+15
| | | |
* | | | Merge topic 'EclipseLinkedResourcesToSubProjects2'Brad King2011-03-011-19/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e8a97e0 Eclipse projects: created one linked resource for each subproject
| * | | | Eclipse projects: created one linked resource for each subprojectAlex Neundorf2011-02-131-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now a virtual folder "Subprojects" is created, and in this virtual folder is a linked resource for each project(). This can be considered a fix for #11657 Alex
* | | | | KWSys Nightly Date StampKWSys Robot2011-03-011-2/+2
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-02-281-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-02-271-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-02-261-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2011-02-251-1/+1
| |/ / / |/| | |
* | | | Merge topic 'mingw-module-definition'Brad King2011-02-244-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 6c4b249 Fix Fortran test .def file symbol mangling 7616216 Pass .def files directly to MinGW tools (#9997)
| * | | | Fix Fortran test .def file symbol manglingBrad King2011-02-233-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6a61a8a5 (Honor module .def files with MinGW tools, 2011-02-21) enabled use of .def files with GNU tools on Windows. Previously the Fortran tests's world.def file was used only for the Intel Fortran Compiler on Windows and contained the symbol name mangled for that compiler. Instead choose a .def file that names the symbol with proper mangling for the compiler in use.
| * | | | Pass .def files directly to MinGW tools (#9997)Brad King2011-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6a61a8a5 (Honor module .def files with MinGW tools, 2011-02-21) set CMAKE_LINK_DEF_FILE_FLAG to "-Wl," to enable passing .def files to the linker on MinGW. However, older GNU tools in the MSYS shell do not know how to translate "-Wl,/c/..." to "c:/..." and complain that the file does not exist. Instead set the flag to just "" which tells CMake it can pass the file through the front-end with no special flag.
* | | | | KWSys Nightly Date StampKWSys Robot2011-02-241-1/+1
| |_|_|/ |/| | |
* | | | KWSys Nightly Date StampKWSys Robot2011-02-231-1/+1
| |_|/ |/| |
* | | Merge topic 'qt4-fphsa'Brad King2011-02-221-133/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7a1027a When checking find_package() components, special case qtmain. 4c1c358 FindQt4: Include builtin FindPackageHandleStandardArgs directly 43cb9b8 Change to use fphsa to check required variables and version.
| * | | When checking find_package() components, special case qtmain.Clinton Stimpson2011-02-041-1/+7
| | | | | | | | | | | | | | | | | | | | Its just a library on Windows only. Fixes bug #11791.
| * | | FindQt4: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | Apply to FindQt4 change from commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28).
| * | | Change to use fphsa to check required variables and version.Clinton Stimpson2011-01-151-133/+46
| | | | | | | | | | | | | | | | | | | | Also, set the required variables based on components, if specified. Also, don't make finding uic required if not using QtGui.
* | | | Merge topic 'mingw-module-definition'Brad King2011-02-222-1/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | 6a61a8a Honor module .def files with MinGW tools (#9997)
| * | | Honor module .def files with MinGW tools (#9997)Brad King2011-02-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 024d05ad (Fix use of module .def files for MS tools, 2009-09-29) module .def files work for any platform that sets CMAKE_LINK_DEF_FILE_FLAG correctly. Set it in the Windows-GNU platform information file to enable support with MinGW tools. Also enable the test added by commit 0db2c850 (Test use of module .def files for MS tools, 2009-09-29) for MinGW and MSYS generators.
* | | | Merge topic 'qt4-macfind'Brad King2011-02-221-4/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4167be0 Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.
| * | | | Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.Clinton Stimpson2011-02-191-4/+21
| | | | |
* | | | | Merge topic ↵Brad King2011-02-224-2/+151
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'resolve/add-STRING-subcommand-FIND-issue-11795/fix-2828-more-info-in-script-mode' 1a8eed1 Merge branch 'add-STRING-subcommand-FIND-issue-11795' into fix-2828-more-info-in-script-mode 006124b Avoid direct use of std::stringstream 8a8da36 Merge branch 'fix-2828-more-info-in-script-mode' into add-STRING-subcommand-FIND-issue-11795 1462561 Add a string(FIND) sub-command (#11795)
| * \ \ \ \ Merge branch 'add-STRING-subcommand-FIND-issue-11795' into ↵Brad King2011-02-171-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix-2828-more-info-in-script-mode
| | * | | | | Avoid direct use of std::stringstreamBrad King2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In method cmStringCommand::HandleFindCommand added by parent commit use the cmOStringStream compatibility wrapper instead of std::stringstream.
| * | | | | | Merge branch 'fix-2828-more-info-in-script-mode' into ↵Brad King2011-02-156-11/+38
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-STRING-subcommand-FIND-issue-11795 Conflicts: Tests/CMakeTests/StringTestScript.cmake
| * | | | | | Add a string(FIND) sub-command (#11795)Tim Hütz2011-02-154-2/+151
| | | | | | |
* | | | | | | Merge topic 'fix-2828-more-info-in-script-mode'Brad King2011-02-227-17/+85
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a58ace6 Fix KWStyle line-too-long complaint (#2828) 106958c Add CMAKE_ARGC and CMAKE_ARGV0..N-1 variables (#2828) 94d1684 Add CMAKE_SCRIPT_MODE_FILE variable (#2828)
| * | | | | | | Fix KWStyle line-too-long complaint (#2828)David Cole2011-02-041-1/+2
| | | | | | | |
| * | | | | | | Add CMAKE_ARGC and CMAKE_ARGV0..N-1 variables (#2828)David Cole2011-02-035-6/+46
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | For now, these variables are only available in -P script mode.
| * | | | | | Add CMAKE_SCRIPT_MODE_FILE variable (#2828)David Cole2011-02-026-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New CMake variable is set when processing a -P script file, but not when configuring a project.
* | | | | | | Merge topic 'fix-11877-sort-tests-correctly'Brad King2011-02-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8af8eab Use stable_sort to preserve test order (#11877)
| * | | | | | | Use stable_sort to preserve test order (#11877)David Cole2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using sort results in a possibly-modified sorting when all elements are "tied" - use stable_sort instead to preserve the original ordering of tied elements.
* | | | | | | | Merge topic 'CPackRPM-HonorAllComponentWays'Brad King2011-02-225-23/+229
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cf1d72 CPackRPM fix IRIX compiler warning (variable never used) 494bb8a CPackRPM honors all the different ways of packaging components
| * | | | | | | | CPackRPM fix IRIX compiler warning (variable never used)Eric NOULARD2011-02-151-1/+1
| | | | | | | | |
| * | | | | | | | CPackRPM honors all the different ways of packaging componentsEric NOULARD2011-02-065-23/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPM cannot easily 'merge' differents directory into a single RPM with shared prefix. So more flexibility has been added to generic CPackGenerator in order to let the specific generator chose the local installation directory for each component.
* | | | | | | | | Merge topic 'AddCustomTargetSourcesToCodeBlocksProject'Brad King2011-02-221-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a9f7f9 Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736)
| * | | | | | | | | Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736)Alex Neundorf2011-02-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CMake 2.6.3 add_custom_target() has a SOURCES option, this was not yet considered in the C::B generator. Also, now GENERATED files are not added to the project. Alex
* | | | | | | | | | Merge topic 'FixBadXMLInEclipseProjects'Brad King2011-02-221-7/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79e13af Add XML escaping for directory name in Eclipse projects (#11658) 8074bca Fix XML escaping for target names in Eclipse project files (#11658) cb94587 Fix XML escaping for the project() name in Eclipse projects (#11658)
| * | | | | | | | | Add XML escaping for directory name in Eclipse projects (#11658)Alex Neundorf2011-02-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | | Fix XML escaping for target names in Eclipse project files (#11658)Alex Neundorf2011-02-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | | Fix XML escaping for the project() name in Eclipse projects (#11658)Alex Neundorf2011-02-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | | | | Merge topic 'init-LDFLAGS-issue-11840'Brad King2011-02-221-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b77516 Fix linker flag initialization from LDFLAGS (#11840)