summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | | Merge topic 'fix-PathScale-compiler-id'Brad King2012-11-062-16/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fccf19f Fix PathScale compiler id for Clang-based upstream
| * | | | | | | | Fix PathScale compiler id for Clang-based upstreamBrad King2012-11-052-16/+16
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream PathScale now uses Clang as its front-end. Test for __PATHCC__ before __clang__. Reported-by: C. Bergström <cbergstrom@pathscale.com>
* | | | | | | | Merge topic 'fix-openssl-win'Brad King2012-11-061-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a4c0ee FindOpenSSL: also find the non-MD debug libraries for MSVC 894b775 FindOpenSSL: fix library selection on Windows (#13645)
| * | | | | | | | FindOpenSSL: also find the non-MD debug libraries for MSVCRolf Eike Beer2012-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already search for them in release mode.
| * | | | | | | | FindOpenSSL: fix library selection on Windows (#13645)Rolf Eike Beer2012-11-051-0/+5
| |/ / / / / / /
* | | | | | | | Merge topic 'pdb-default-outdir'Brad King2012-11-062-5/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f309366 Fix default PDB output directory (#13644)
| * | | | | | | | Fix default PDB output directory (#13644)Brad King2012-11-022-5/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ComputePDBOutputDir added by commit 3f60dbf1 (Add PDB_OUTPUT_DIRECTORY and PDB_NAME target properties, 2012-09-25) falls back to the current binary directory instead of the target output directory as before. When no PDB_OUTPUT_DIRECTORY property is set we instead should fall back to the target output directory where .pdb files used to go before the new property was added.
* | | | | | | | CMake Nightly Date StampKitware Robot2012-11-061-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-11-051-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-11-041-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-11-031-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-11-021-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-11-011-1/+1
| | | | | | |
* | | | | | | Merge topic 'doc-external-language-policy'David Cole2012-10-311-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 854369f Document external language support policy
| * | | | | | | Document external language support policyBrad King2012-10-301-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe in "Modules/CMakeAddNewLanguage.txt" our policy for external language support.
* | | | | | | | Merge topic 'parisc-default-flags'David Cole2012-10-312-0/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e496c54 Linux/PA-RISC: Link with --unique=.text.* to help binutils
| * | | | | | | | Linux/PA-RISC: Link with --unique=.text.* to help binutilsRolf Eike Beer2012-10-312-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a binutils bug that leads to errors like this: /usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: libCMakeLib.a(cmTarget.cxx.o)(.text+0x12084): cannot reach 00001d28__ZNSspLEPKc@@GLIBCXX_3.4+0, recompile with -ffunction-sections /usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: libCMakeLib.a(cmTarget.cxx.o)(.text+0x12084): cannot handle R_PARISC_PCREL17F for std::basic_string<char, std::char_traits<char>, std::allocator<char> >::operator+=(char const*)@@GLIBCXX_3.4 /usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: final link failed: Bad value Until someone finds out what needs to be fixed in binutils this allows anyone to compile a working CMake even in debug mode.
* | | | | | | | | Merge topic 'packagemaker-component-postflight'David Cole2012-10-313-36/+97
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4374441 PackageMaker: Enable postflight script in component mode (#12375)
| * | | | | | | | | PackageMaker: Enable postflight script in component mode (#12375)Clinton Stimpson2012-10-313-36/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, setting CPACK_POSTFLIGHT_SCRIPT had no effect in component mode, when CPACK_COMPONENTS_ALL was set. In component mode, a .mpkg is created that contains multiple .pkg's. Because postflight scripts only work in a .pkg, add another .pkg to the .mpkg and put the postflight script in that. This is the same approach taken by the PackageMaker GUI when adding a postflight script to a metapackage.
* | | | | | | | | | Merge topic 'vs10-DelaySign-KeyFile'David Cole2012-10-315-84/+96
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 035e7bd VS10: Honor /DELAYSIGN and /KEYFILE flags (#13601) c65a2ea VS10: Refactor link options collection
| * | | | | | | | | | VS10: Honor /DELAYSIGN and /KEYFILE flags (#13601)Brad King2012-10-262-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the VS 10 link flag map to name the project file entries correctly. The VS 11 link flag map already has the correct names. Generate the entries in the <PropertyGroup> along with incremental linking options. Drop them from the <Link> element because VS does not use them.
| * | | | | | | | | | VS10: Refactor link options collectionBrad King2012-10-264-81/+76
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid collecting the link options twice. Collect them once in a LinkOptions member and use it from both places. We already do this for compiler options with the ClOptions member.
* | | | | | | | | | Merge topic 'update-KWIML'David Cole2012-10-311-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e3f95e Merge branch 'upstream-kwiml' into update-KWIML 4156235 KWIML: Teach ABI.h that VAX is big endian
| * \ \ \ \ \ \ \ \ \ Merge branch 'upstream-kwiml' into update-KWIMLBrad King2012-10-251-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |