summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add CMakeAddFortranSubdirectory to use MinGW gfortran in VSBill Hoffman2012-02-0911-0/+282
| | | | | | | This patch adds a new module that allows for easy integration of MinGW gfortran and the Visual Studio compiler. It is done in a function called cmake_add_fortran_subdirectory. The patch also includes a test for this feature.
* Merge branch 'add-CheckLanguage-module' into CMakeAddFortranSubdirectoryBrad King2012-02-093-0/+89
|\
| * Add CheckLanguage moduleBrad King2012-02-083-0/+89
| | | | | | | | | | | | Define a "check_language(<lang>)" macro to test whether <lang> can be enabled. Cache the result in CMAKE_<lang>_COMPILER. Add a test case covering expected results.
* | KWSys Nightly Date StampKWSys Robot2012-02-081-1/+1
|/
* Merge topic 'update-mini5-release-qt'David Cole2012-02-071-1/+1
|\ | | | | | | | | 495f899 Update version of Qt for dashmacmini5 produced release binaries
| * Update version of Qt for dashmacmini5 produced release binariesDavid Cole2012-02-061-1/+1
| | | | | | | | Use 4.8.0
* | Merge topic 'fix-ccmake-clear'David Cole2012-02-071-6/+5
|\ \ | | | | | | | | | | | | | | | 415ffda ccmake: Extend clear line. 1dd43c4 ccmake: Factor clear line.
| * | ccmake: Extend clear line.Nicolas Despres2012-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When configuring or generating the 'ng' of the end of the second line is not cleared. This patch fixes this. The problem was introduced by commit fd632195 (ccmake: Align 'g' and 'q' key instructions, 2011-01-07) which adjusted the length of lines that need clearing.
| * | ccmake: Factor clear line.Nicolas Despres2012-02-051-6/+5
| | |
* | | Merge topic 'warn-funny-path-names'David Cole2012-02-073-26/+15
|\ \ \ | | | | | | | | | | | | | | | | c8ef643 Allow directory names containing '=' and warn if necessary (#12934)
| * | | Allow directory names containing '=' and warn if necessary (#12934)Brad King2012-02-063-26/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The approach taken by commit 8704525f (Reject directory names containing '=', 2011-01-14) was perhaps too heavy-handed for avoiding the obscure cases when '=' in the path fails due to limitations of Make syntax. Only two CMake tests: LinkDirectory OutOfSource fail when the path contains '=' and they cover obscure cases. Instead of rejecting such paths outright just warn when the problem may occur.
* | | | Merge topic 'remove-unused-test-code'David Cole2012-02-076-118/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | daa4101 Remove unused test code
| * | | | Remove unused test codeBrad King2012-02-036-118/+29
| | | | | | | | | | | | | | | | | | | | | | | | | We have not run tests with the "como" compiler or enabled the experimental ConvLibrary test for years.
* | | | | Merge topic 'lang-enable-order-issue-12929'David Cole2012-02-076-6/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7495845 Fix CXX/Fortran MODULE flags when enabled before C (#12929)
| * | | | | Fix CXX/Fortran MODULE flags when enabled before C (#12929)Brad King2012-02-036-6/+32
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CXX or Fortran is enabled before C then the values of CMAKE_SHARED_MODULE_C_FLAGS CMAKE_SHARED_MODULE_CREATE_C_FLAGS may not be available. On platforms where MODULE library (plugin) creation is the same as SHARED library creation initialize the MODULE creation flags from the SHARED creation flags of the matching language instead of assuming that C has been enabled first. Teach the COnly and CxxOnly tests to build MODULE libraries. The latter covers this specific case.
* | | | | Merge topic 'VS11-WinRT-project-issue-12930'David Cole2012-02-073-17/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a03447b VS: Simplify ;-separated attribute value parsing 9e01aef VS: Add support for WinRT project properties (#12930)
| * | | | | VS: Simplify ;-separated attribute value parsingBrad King2012-02-031-34/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An implementation ;-separated list parsing was added by commit a1f976ce (VS: Add support for three new project properties, 2011-11-23) and again by commit 9e01aefd (VS: Add support for WinRT project properties, 2012-02-03). Refactor both instances to use ExpandListArgument.
| * | | | | VS: Add support for WinRT project properties (#12930)Eugene Golushkov2012-02-033-1/+48
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS_WINRT_EXTENSIONS: Boolean property that correspond to "Enable Tailored Features" in Visual Studio 11 IDE. VS_WINRT_REFERENCES: Semicolon-delimited list of *.winmd references to add to the project, which creates a new <ItemGroup>.
* | | | | Merge topic 'change-trilinos-submit-url'David Cole2012-02-071-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bf2e385 Tests: Update drop site value for the Trilinos contract test
| * | | | | Tests: Update drop site value for the Trilinos contract testDavid Cole2012-02-031-0/+18
| | | | | |
* | | | | | Merge topic 'AddTopLevelForComponent'David Cole2012-02-072-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d18851 CPackArchive restore default behavior and provide new variable. 3cab24a CPack Add top level directory in component install for Archive Generators
| * | | | | | CPackArchive restore default behavior and provide new variable.Eric NOULARD2012-02-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY should be set by the user in order to get the toplevel directory included in the archive whenever a componentized archive is requested. This solves bug #12129 and keeps fully backward compatible behavior.
| * | | | | | CPack Add top level directory in component install for Archive GeneratorsDaniel Nelson2012-01-132-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes bug #0012129 Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | | | | Merge topic 'improve-libarchive'David Cole2012-02-071-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e25b12 FindLibArchive: support version selection
| * | | | | | | FindLibArchive: support version selectionRolf Eike Beer2012-02-011-2/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'perl-version'David Cole2012-02-072-27/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31826b5 FindPerl{,Libs}: move version detection into FindPerl
| * | | | | | | FindPerl{,Libs}: move version detection into FindPerlRolf Eike Beer2012-02-012-27/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the first attempt of getting the version doesn't succeed, try a second approach.
* | | | | | | | Merge topic 'check_include_files_output'David Cole2012-02-071-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44d007b CheckIncludeFiles: fix status output
| * | | | | | | | CheckIncludeFiles: fix status outputRolf Eike Beer2012-02-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHECK_INCLUDE_FILES("foo.h" HAVE_FOO_H) gave an output like: Looking for include files HAVE_FOO_H After this change it does now what CHECK_INCLUDE_FILE() also does: Looking for include files foo.h
* | | | | | | | | Merge topic 'AllFindModules-test'David Cole2012-02-071-11/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed1b126 CMakeOnly.AllFindModules: require version for some modules 2dee929 CMakeOnly.AllFindModules: suppress two modules from testing 3c4b4ff CMakeOnly.AllFindModules: always check FindQt 9d72b25 CMakeOnly.AllFindModules: clean up the Qt3/Qt4 code
| * | | | | | | | | CMakeOnly.AllFindModules: require version for some modulesRolf Eike Beer2012-02-011-0/+22
| | | | | | | | | |
| * | | | | | | | | CMakeOnly.AllFindModules: suppress two modules from testingRolf Eike Beer2012-01-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindPackageHandleStandardArgs and FindPackageMessage match the glob expression but are nothing that will usually be fed into find_package().
| * | | | | | | | | CMakeOnly.AllFindModules: always check FindQtRolf Eike Beer2012-01-261-2/+4
| | | | | | | | | |
| * | | | | | | | | CMakeOnly.AllFindModules: clean up the Qt3/Qt4 codeRolf Eike Beer2012-01-261-11/+11
| | | | | | | | | |
* | | | | | | | | | Merge topic 'find-vcexpress'David Cole2012-02-071-8/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de28946 Find VC Express during default generator selection (#12917)
| * | | | | | | | | | Find VC Express during default generator selection (#12917)Peter Kuemmel2012-02-011-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake doesn't find Visual C++ Express and uses "NMake Makefiles" generator by default when one calls cmake WITHOUT using the -G options. Teach CMake to find VC Express to use it as the default generator just like the commercial versions.
* | | | | | | | | | | Merge topic 'nsis-user-perm-issue-12923'David Cole2012-02-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4a0bce CPack: Fix NSIS handling of privileged users (#12923)
| * | | | | | | | | | | CPack: Fix NSIS handling of privileged users (#12923)Mattias Helsing2012-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the NSIS generator from CPack the file NSIS.template.in is used to generate a project.nsi file for NSIS to process. The file consists code in the NSIS scripting language. Among other functions there is an onInit function the initializes the installer. The function (tries to) recognise admin and power users but fails since NSIS scripting language relative includes the jump from the current command so +3 means "run the third command after this one", so a failed check for admin completely skips the check for a power user and goes directly to "done:". User permission lookup was added in initial NSIS support by commit a11b9a4c (Merge from CPack branch, 2006-01-01). Later commit b1b052fd (Several changes to for NSIS, 2006-03-01) added a line inside a block that should be skipped by a jump without updating the jump length. Update the jump length to correct the behavior.
* | | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-071-1/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-061-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-051-1/+1
| | | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-041-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-031-1/+1
| | | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2012-02-021-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'update-nightly-cmake-qt-version-again'David Cole2012-02-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a94ef02 Update dashmacmini2 release script to use Qt 4.8.0
| * | | | | | | | Update dashmacmini2 release script to use Qt 4.8.0David Cole2012-01-311-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'rpath-docs-whitespace'David Cole2012-02-011-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33eee2c Add whitespace after '.' in CMAKE_SKIP_RPATH docs.
| * | | | | | | | | Add whitespace after '.' in CMAKE_SKIP_RPATH docs.Stephen Kelly2012-01-311-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'check_cxx_compiler_flag_cmakeonly'David Cole2012-02-013-18/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8de3b3d CheckCXXCompilerFlag test: make it a CMakeOnly test
| * | | | | | | | | CheckCXXCompilerFlag test: make it a CMakeOnly testRolf Eike Beer2012-01-303-18/+2
| | |_|_|/ / / / / | |/| | | | | | |