summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Resolve warnings about used enum values in switch blocks.Stephen Kelly2012-11-133-0/+7
|
* Resolve warnings about unused variables.Stephen Kelly2012-11-074-3/+1
|
* Merge topic 'MakeSquish4Work'Brad King2012-11-064-29/+234
|\ | | | | | | | | | | | | | | | | | | 3a0ffa6 Squish: add support for squish 4 (#9734) 2ae9d03 Squish: use ${CMAKE_CURRENT_LIST_DIR} 53c42cb Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bit daf1c4d Squish: find executables also under Windows b878cd6 Squish: use FPHSA 3fe2bc6 Squish: detect version
| * Squish: add support for squish 4 (#9734)Alex Neundorf2012-11-054-20/+197
| | | | | | | | | | | | | | | | | | This patch adds support for Squish 4.x. The changes are basically what is attached to http://public.kitware.com/Bug/view.php?id=9734. When adding a test for squish 4.x, use squish_v4_add_test(). Alex
| * Squish: use ${CMAKE_CURRENT_LIST_DIR}Alex Neundorf2012-11-051-1/+2
| | | | | | | | | | | | Use ${CMAKE_CURRENT_LIST_DIR} instead of constructing the dir from pieces. Alex
| * Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bitAlex Neundorf2012-11-051-4/+14
| | | | | | | | | | | | | | | | | | | | There is still a wrapper macro squish_add_test(), but this now mentions that you should use squish_v3_add_test() instead. Also, the docs for the macro were just wrong. They are at least correct now, but still hard to understand (I don't have squish 3 around, so I can't improve them). Alex
| * Squish: find executables also under WindowsAlex Neundorf2012-11-041-2/+2
| | | | | | | | | | | | | | This is required according to Volker Krause (see http://public.kitware.com/Bug/view.php?id=9734) Alex
| * Squish: use FPHSAAlex Neundorf2012-11-041-6/+4
| | | | | | | | Alex
| * Squish: detect versionAlex Neundorf2012-11-041-0/+19
| | | | | | | | Alex
* | Merge topic 'ctest-SUBMIT_INDEX-cdash'Brad King2012-11-063-1/+6
|\ \ | | | | | | | | | | | | 1cfaa2f CTest: Allow SUBMIT_INDEX with CDash
| * | CTest: Allow SUBMIT_INDEX with CDashBrad King2012-11-013-1/+6
| | | | | | | | | | | | | | | If CTEST_DROP_SITE_CDASH is true then SUBMIT_INDEX is supported. The Dart version does not matter because the server is not Dart.
* | | Merge topic 'TI_DSP_Compiler'Brad King2012-11-063-0/+28
|\ \ \ | | | | | | | | | | | | | | | | 65e9bbe Add support for Texas Instruments DSP compiler (#12405)
| * | | Add support for Texas Instruments DSP compiler (#12405)Alex Neundorf2012-11-043-0/+28
| | |/ | |/| | | | | | | | | | | | | | | | This is for the cl6x compiler from TI, which is used for TI DSPs. The toolchain can be downloaded for free for Linux and Windows. Alex
* | | Merge topic 'fix-module-includes'Brad King2012-11-0653-65/+65
|\ \ \ | | | | | | | | | | | | | | | | 8ebf74b Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()
| * | | Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()Rolf Eike Beer2012-11-0453-65/+65
| | | | | | | | | | | | | | | | | | | | | | | | This solves a lots of warnings, e.g. in the FindModulesExecuteAll test. If the installed version on the system is rather old this may even lead to bugs, e.g. https://bugs.gentoo.org/show_bug.cgi?id=436540
* | | | Merge topic 'FixImplicitDepends2'Brad King2012-11-0613-166/+195
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05f162c AddCustomCommand: Handle multiple IMPLICIT_DEPENDS files (#10048) c66f03a cmDepends: No dependency-vector erasure in CheckDependencies e74ff7c cmDepends: allow multiple dependees per depender ecc77d0 cmDependsC: fix indentation 3e7d97d cmDependsC: remove code duplication b4e8f49 cmDependsC: remove unused member variable
| * | | | AddCustomCommand: Handle multiple IMPLICIT_DEPENDS files (#10048)Alex Neundorf2012-11-065-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code handling IMPLICIT_DEPENDS was only able to track a single file, the latest file replaced earlier files in the list. The documentation now mentions that the language has to be prefixed to every file and the test now uses two implicit dependencies, where only the second is modified to trigger re-running of the custom command. Alex Inspired-by: Michael Wild <themiwi@users.sourceforge.net>
| * | | | cmDepends: No dependency-vector erasure in CheckDependenciesMichael Wild2012-11-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some dependency-generators (such as cmDependsFortran) generate multiple entries per depender, so erasing the dependency vector for each depender found loses earlier dependencies. Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
| * | | | cmDepends: allow multiple dependees per dependerAlex Neundorf2012-11-068-47/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is heavily inspired by Michael Wild. The interfaces cmDepends::Write and cmDepends::WriteDependencies where extended to allow multiple dependees (sources) per depender (object). cmDepends::Write first collect all dependencies into a std::set before passing it to cmDepends::WriteDependencies. cmDependsC::WriteDependencies also first collects all explicit and implicit dependencies into a std::set and only then writes depend.{internal,make}. The implementation of cmDependsFortran simply loops over all sources and proceeds as before, whereas the cmDependsJava implementation is as trivial as before. This is for preventing exponential growth of depend.{internal,make} in the next commit which fixes dependency-vector erasure in cmDepends::CheckDependencies. Inspired-by: Michael Wild <themiwi@users.sourceforge.net>
| * | | | cmDependsC: fix indentationAlex Neundorf2012-11-061-105/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intentionally a separate commit, so the parent commit which changes the logic is small and not mixed with formatting (indentation) changes. So, this patch here does not change any logic. Alex
| * | | | cmDependsC: remove code duplicationAlex Neundorf2012-11-031-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reduces a bit code duplication by changing the way how the case that we already have valid dependencies for a file is handled. Instead of having the code for writing the depend-files twice, we now fill the existing dependencies into the same set and then write it out once at the end of cmDependsC::WriteDependencies() Alex Inspired-by: Michael Wild <themiwi@users.sourceforge.net>
| * | | | cmDependsC: remove unused member variableAlex Neundorf2012-09-301-3/+0
| | | | | | | | | | | | | | | | | | | | Alex
* | | | | Merge topic 'EclipseFixIndexerBySettingSourcePath'Brad King2012-11-061-5/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 077de8b Eclipse: set source path once to fix Eclipse indexer (#13596)
| * | | | | Eclipse: set source path once to fix Eclipse indexer (#13596)Alex Neundorf2012-11-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CMake 2.8.7 no src-path entry was generated anymore, in response to http://www.cmake.org/Bug/view.php?id=12213 Before that a src-path entry was added for each linked resource. Now only one src-path entry is added, for the ${CMAKE_SOURCE_DIR}. According to http://www.cmake.org/Bug/view.php?id=13596 this makes the indexer behave better. Alex
* | | | | | Merge topic 'start-contributing-irc-session'Brad King2012-11-0624-76/+202
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 828d4f5 Add several get_property() tests 82106e3 GetProperty test: move doc property tests into main process 56125a3 list: add tests for CMP0007 behavior 48ed48f Add test to secure the file(GLOB empty) behavior. c2a6cb6 file: remove dead code 07251a8 Consolidate list() argument count testing 1b078c3 Add tests for list() invalid arguments f560977 Add tests for list() argument count d211e5d CMakeTests: allow to call the check_cmake_test macro with a given file
| * | | | | | Add several get_property() testsPetr Kmoch2012-11-021-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for some get_property() uses not covered by existing tests.
| * | | | | | GetProperty test: move doc property tests into main processRolf Eike Beer2012-11-022-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They will not raise an error in the normal case so we do not need to run them in their own process.
| * | | | | | list: add tests for CMP0007 behaviorRolf Eike Beer2012-11-022-0/+20
| | | | | | |
| * | | | | | Add test to secure the file(GLOB empty) behavior.Amine Chadly2012-11-021-0/+5
| | | | | | |
| * | | | | | file: remove dead codeAmine Chadly2012-11-024-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file command requires at least two arguments, so guarding the GLOB and MAKE_DIRECTORY command is not necessary. Changed it for an assert to keep the protection.
| * | | | | | Consolidate list() argument count testingPetr Kmoch2012-11-023-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move test for list() argument count >= 2 to InitialPass().
| * | | | | | Add tests for list() invalid argumentsPetr Kmoch2012-11-0210-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for error reporting when list() arguments are invalid.
| * | | | | | Add tests for list() argument countPetr Kmoch2012-11-026-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for error reporting when list() subcommands have wrong number of arguments.
| * | | | | | CMakeTests: allow to call the check_cmake_test macro with a given fileRolf Eike Beer2012-11-021-24/+29
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This allows to generate a lot of simple files directly in the test tree instead of having them all checked in.
* | | | | | Merge topic 'deb-rpm-all_components_in_one'Brad King2012-11-064-12/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e2694 CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"
| * | | | | | CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"Clinton Stimpson2012-11-064-12/+24
| | | | | | |
* | | | | | | Merge topic 'FindQt-MajorVersionSelection-test'Brad King2012-11-061-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 656afca FindQt: add to MajorVersionSelection test
| * | | | | | | FindQt: add to MajorVersionSelection testRolf Eike Beer2012-11-011-0/+1
| | | | | | | |
* | | | | | | | Merge topic 'fix-13571-avoid-empty-sln-folders'Brad King2012-11-061-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7de641 VS: Avoid empty, unreferenced solution folders... (#13571)
| * | | | | | | | VS: Avoid empty, unreferenced solution folders... (#13571)David Cole2012-10-241-0/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in generated sub-directory sln files. Thanks to rlandert for the bug report and proposed patch. The method WriteTargetsToSolution gets called possibly multiple times, once per sln file, (-> once per "project" command). Before accumulating folder names in VisualStudioFolders, clear it first, so it doesn't have stale entries in it from the previous sln file.
* | | | | | | | Merge topic 'fix-13600-better-framework-regex'Brad King2012-11-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89256e0 BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
| * | | | | | | | BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)David Cole2012-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some frameworks might be built with the library right at the root of the framework rather than down in a versioned sub-folder with a symlink at the root. Make one of the slashes in the REGEX optional so BundleUtilities can still properly work with such frameworks ... even if they are weird. ;-) Thanks to Tobias Hieta for the bug report and for trying out the fix before I pushed this commit.
* | | | | | | | | Merge topic 'osx-sysroot-cleanup'Brad King2012-11-061-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15f5764 OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
| * | | | | | | | | OS X: Fix default CMAKE_OSX_SYSROOT with deployment targetBrad King2012-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when one is needed. However, the change forgot that we require a sysroot when a deployment target is requested. Teach Darwin.cmake to choose a default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set. Reported-by: Matthew Brett <matthew.brett@gmail.com> Reported-by: Bradley Giesbrecht <pixilla@macports.org>
* | | | | | | | | | Merge topic 'fix-FindSDL-paths'Brad King2012-11-061-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cb5173 FindSDL: Restore accidentally dropped search paths (#13651)
| * | | | | | | | | | FindSDL: Restore accidentally dropped search paths (#13651)Brad King2012-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup in commit 9ed24c53 (FindSDL: Remove from find_... calls PATHS that are set by default, 2012-09-04) accidentally dropped some search paths. Restore the dropped PATH_SUFFIXES and add more suffixes needed to search paths that were previously hard-coded. Reported-by: Gino van den Bergen <gino@dtecta.com>
* | | | | | | | | | | Merge topic 'fix-genex-CONFIG'Brad King2012-11-064-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9be64f3 GenEx: Use case insensitive comparison for $<CONFIG:...>
| * | | | | | | | | | | GenEx: Use case insensitive comparison for $<CONFIG:...>Stephen Kelly2012-11-054-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by commit f1eacf0e (cmGeneratorExpression: Re-write for multi-stage evaluation).
* | | | | | | | | | | | Merge topic 'copyright-year'Brad King2012-11-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4ae88b Update programmatically-reported copyright year (#13638)
| * | | | | | | | | | | | Update programmatically-reported copyright year (#13638)Brad King2012-11-052-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the copyright year reported by 'bootstrap' and in the generated documentation to report 2012.