summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-9148-cpack-nsis-installer-root'Brad King2011-01-113-3/+16
|\ | | | | | | | | 5a9e8e7 CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)
| * CPack: Add CPACK_NSIS_INSTALL_ROOT variable (#9148)David Cole2011-01-113-3/+16
| | | | | | | | | | | | | | | | | | | | Control the root directory of the default directory presented to the end user of an NSIS installer by a CPack variable. Previously, the value used in the NSIS script was $PROGRAMFILES, which is equivalent to the "ProgramFiles" environment variable. That default value is still the same, but now a project may override the value by setting this new variable.
* | Merge topic 'fix-10644-cpack-menu-links'Brad King2011-01-112-12/+29
|\ \ | |/ | | | | | | 1bbe4e6 CPack: Detect more URLs in CPACK_NSIS_MENU_LINKS (#10644)
| * CPack: Detect more URLs in CPACK_NSIS_MENU_LINKS (#10644)David Cole2011-01-072-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only strings containing "http:" qualified as URLs when found in CPACK_NSIS_MENU_LINKS. Now, we use a regex to detect strings beginning with any of the following: ftp:// ftps:// http:// https:// news:// mailto: This commit also moves the caller of CreateMenuLinks outside the "if (cpackPackageExecutables)" block, allowing clients to use CPACK_NSIS_MENU_LINKS without also having CPACK_PACKAGE_EXECUTABLES defined. That bit of this commit fixes the remainder of the issue described in http://public.kitware.com/Bug/view.php?id=7828 Also, added a set(CPACK_NSIS_MENU_LINKS ...) to the CPackComponents test to enable verifying that all of this actually works.
* | Merge topic 'cpack-nsis-changes'Brad King2011-01-113-9/+41
|\ \ | | | | | | | | | | | | | | | | | | bee514c Add CPack NSIS MUI_FINISHPAGE_RUN support (#11144) 702c8f8 Add CPACK_NSIS_EXECUTABLES_DIRECTORY (#7828) fec3232 Allow NSIS package or uninstall icon (#11143)
| * | Add CPack NSIS MUI_FINISHPAGE_RUN support (#11144)Mike McQuaid2011-01-063-0/+15
| | | | | | | | | | | | | | | | | | | | | MUI_FINISHPAGE_RUN is frequently used with NSIS and provides a checkbox on the finish page of an installer which specifies whether the specified executable should be run when the installer exits. This commit adds support for this setting in CPack.
| * | Add CPACK_NSIS_EXECUTABLES_DIRECTORY (#7828)Mike McQuaid2011-01-062-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | NSIS installers default to assuming the executables exist in a directory named "bin" under the installation directory. As this isn't usual for Windows programs, the addition of this variable allows the customization of this directory and links still to be created correctly.
| * | Allow NSIS package or uninstall icon (#11143)Mike McQuaid2011-01-061-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | Previously both CPACK_NSIS_MUI_ICON and CPACK_NSIS_MUI_UNIICON needed to be set for either to take effect. This commit allows either to be set rather than requiring both as users may well want to e.g. use a default uninstall icon but a custom install icon.
* | | KWSys Nightly Date StampKWSys Robot2011-01-111-1/+1
| | |
* | | KWSys: Fix WOW64 registry mode on Windows 2000 (#10759)David Cole2011-01-101-2/+2
| | | | | | | | | | | | | | | | | | The previous commit did not compile with mingw gcc. Use the Windows type FARPROC instead of void* for the local variable.
* | | KWSys Nightly Date StampKWSys Robot2011-01-101-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-01-091-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2011-01-081-1/+1
| |/ |/|
* | Fix WOW64 registry mode on Windows 2000 (#10759)David Cole2011-01-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake fails to find any registry paths on Windows 2000: according to regmon it fails with an access denied error. I double checked all the access rights and they are fine. After checking the access modes on MSDN I found that it says KEY_WOW64_32KEY / KEY_WOW64_64KEY are not supported on Windows 2000. CMake does not check if the current system supports Wow64 before applying these flags. This commit adds a check for IsWow64Process in kernel32.dll before adding these flags. Author: Axel Gembe <ago@bastart.eu.org> Signed-off-by: Axel Gembe <ago@bastart.eu.org>
* | KWSys Nightly Date StampKWSys Robot2011-01-071-1/+1
|/
* KWSys Nightly Date StampKWSys Robot2011-01-061-1/+1
|
* KWSys: Retrieve QNX specific memory and processor info (#11329)David Cole2011-01-051-0/+91
| | | | Author: Rolf Eike Beer <eike@sf-mail.de> 2010-10-18 12:03:39
* KWSys: Fix CPU speed calculations (#9963)David Cole2011-01-051-4/+4
| | | | | | To get from Hz to MHz the factor is 10^6, not 2^20. Author: Rolf Eike Beer <eike@sf-mail.de> 2010-10-24 06:31:11
* KWSys Nightly Date StampKWSys Robot2011-01-051-1/+1
|
* Merge topic 'negative-test-costs'Brad King2011-01-046-12/+94
|\ | | | | | | | | 6b0c7de Support explicitly set test costs in non-parallel testing.
| * Support explicitly set test costs in non-parallel testing.Zach Mullen2011-01-036-12/+94
| |
* | Merge topic 'honor-explicit-zero-timeout'Brad King2011-01-049-28/+101
|\ \ | | | | | | | | | | | | 51bb493 Test TIMEOUT property explicitly set to zero should be honored
| * | Test TIMEOUT property explicitly set to zero should be honoredZach Mullen2011-01-039-28/+101
| |/
* | Merge topic 'vs-force-multiple-include'Brad King2011-01-046-1/+21
|\ \ | | | | | | | | | | | | b29eadd Map multiple /FI flags for VS < 10 (#11649)
| * | Map multiple /FI flags for VS < 10 (#11649)Brad King2011-01-036-1/+21
| |/ | | | | | | | | The /FI flag may be repeated so the flag table entry needs to be marked with SemicolonAppendable. This was already the case for VS 10.
* | Merge topic 'dev/add_test-working-directory'Brad King2011-01-042-23/+7
|\ \ | | | | | | | | | | | | 6529d7f Pass the expected value as the first argument
| * | Pass the expected value as the first argumentBen Boeckel2011-01-032-23/+7
| | | | | | | | | | | | | | | When the path has regular expression special characters, the PASS_REGULAR_EXPRESSION value can fail to compile.
* | | Merge topic 'make-install-test-serial'Brad King2011-01-041-0/+3
|\ \ \ | | | | | | | | | | | | | | | | bce24e1 Avoid running CMake.Install test simultaneously with other tests
| * | | Avoid running CMake.Install test simultaneously with other testsDavid Cole2010-12-311-0/+3
| | | |
* | | | Merge topic 'suppress-warnings'Brad King2011-01-041-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d11f439 Suppress erroneous warnings from Intel compiler
| * | | | Suppress erroneous warnings from Intel compilerDavid Cole2010-12-311-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Googling for "warning #980: wrong number of actual arguments to intrinsic function" yields: http://software.intel.com/en-us/articles/cdiag980/ http://software.intel.com/en-us/articles/diagnostic-980-wrong-number-of-actual-arguments-to-intrinsic-function/ Since the compiler is at fault for issuing the warnings incorrectly, simply suppress them from CMake dashboard results.
* | | | Merge topic 'compiler-id-literal-const'Brad King2011-01-043-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dbc79bd Fix constness in compiler id detection
| * | | | Fix constness in compiler id detectionBrad King2010-12-293-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 70c2dc8a (Make compiler id detection more robust, 2008-03-10) we store compiler identification strings in test binaries using the form char* info = "info"; Use the const-correct char const* info = "info"; form instead. This allows the C++ compiler identification to work with "-Werror -Wall" or equivalent flags if the compiler would warn about const-to-non-const conversion.
* | | | | Merge topic 'recognize-TI-DSP'Brad King2011-01-043-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f1392dc Recognize the Texas Instruments DSP compiler (#11645)
| * | | | | Recognize the Texas Instruments DSP compiler (#11645)Wojciech Migda2010-12-283-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TI DSP compiler predefines "__TI_COMPILER_VERSION__". Use this to identify the C and C++ compilers. For assembler language the C compiler executable is used: $ cl6x -h TMS320C6x C/C++ Compiler v6.1.11 Tools Copyright (c) 1996-2009 Texas Instruments Incorporated Use this command-line option and output to recognize the assembler.
* | | | | | Merge topic 'FindBoostTypos'Brad King2011-01-041-184/+189
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5103fe5 Lowercase all function names and improve consistency 97c8f77 Fix spelling BOOST_LIBRARYDIR message. Add error for common misspellings.
| * | | | | | Lowercase all function names and improve consistencyPhilip Lowman2010-12-281-168/+168
| | | | | | |
| * | | | | | Fix spelling BOOST_LIBRARYDIR message. Add error for common misspellings.Philip Lowman2010-12-281-16/+21
| | | | | | |
* | | | | | | Merge topic 'add-trilinos-contract-test'Brad King2011-01-046-0/+264
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8113621 Establish pass criteria for the Trilinos contract test. 7348561 Use m prefix in shorttag value to indicate "md5 of tarball" c8ac930 Add contract test for Trilinos 10.6.1 snapshot.
| * | | | | | | Establish pass criteria for the Trilinos contract test.David Cole2010-12-286-6/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a ValidateBuild.cmake script that runs after the Trilinos dashboard run is complete. In that script, look for some expected Trilinos executable files. Run the basic Teuchos unit tests executable and expect it to return 0 for no errors. Also, patch the main CMakeLists.txt file to get rid of new warnings from CMake when variables passed in on the command line go un-referenced in the CMakeLists processing.
| * | | | | | | Use m prefix in shorttag value to indicate "md5 of tarball"David Cole2010-12-281-0/+1
| | | | | | | |
| * | | | | | | Add contract test for Trilinos 10.6.1 snapshot.David Cole2010-11-095-0/+198
| | | | | | | |
* | | | | | | | Merge topic 'fix-warning-char-string-constant'Brad King2011-01-042-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0bb22cf Avoid passing string literal to char* type
| * | | | | | | | Avoid passing string literal to char* typeBrad King2010-12-282-3/+5
| | | | | | | | |
* | | | | | | | | Merge topic 'add_support_for_windres'Brad King2011-01-0411-5/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 971692c Build enable_language command during bootstrap 960ace1 Add testing for windows resources for mingw/msys/cygwin and remove for watcom. 060d6e8 Add support for windres to cygwin. b2f308c Add support for windows resources with mingw/msys.
| * | | | | | | | | Build enable_language command during bootstrapBrad King2010-12-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 060d6e88 (Add support for windres to cygwin, 2010-12-23) and commit b2f308c8 (Add support for windows resources with mingw/msys, 2010-12-22) introduced enable_language(RC) for the first time in a platform file processed by a bootstrap-built cmake.
| * | | | | | | | | Add testing for windows resources for mingw/msys/cygwin and remove for watcom.Bill Hoffman2010-12-281-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit should test windows resources on all platforms where they are supported now.
| * | | | | | | | | Add support for windres to cygwin.Bill Hoffman2010-12-232-1/+3
| | | | | | | | | |
| * | | | | | | | | Add support for windows resources with mingw/msys.Bill Hoffman2010-12-236-1/+24
| | | | | | | | | |
* | | | | | | | | | Merge topic 'add_preprocessor_def_vs2010_resources'Brad King2011-01-046-2/+30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c7b19d Only run resource test for MSVC compilers. 753e208 Disable incremental testing for this test, it crashes vs9 linker. 16e7d4b Add flags to resource builds on vs 2010 with a test.