summaryrefslogtreecommitdiffstats
path: root/Tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'object-library' into ninja-object-libraryBrad King2012-03-1681-249/+907
|\
| * Use generalized RunCMake test infrastrucure for build_command testBrad King2012-03-1213-100/+27
| | | | | | | | | | | | | | The CMakeCommands.build_command test performs output/error checking so move it over to RunCMake to re-use the generalized infrastrucure. This is the only test left using Tests/CMakeCommands/CMakeLists.txt so remove it.
| * Use generalized RunCMake test infrastrucure for find_package testBrad King2012-03-1234-84/+19
| |
| * Add stronger infrastructure for CMake-only testsBrad King2012-03-124-4/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMakeOnly directory added by commit 9a20abf0 (Add infrastructure for CMake-only tests, 2012-01-11) was sufficient only for tests that always run CMake to successfully configure a project. Later commit eeaaffcb (find_package: Test error and warning messages in failure cases, 2012-02-28) added a sample test that covers failure cases. Generalize the above to create new "RunCMake" test infrastructure that can run CMake multiple times for a single project with different variations and check for expected result/stdout/stderr. Allow for both successful and failing CMake project configuration cases. This will be useful to test error messages and failure behavior.
| * Merge topic 'find_package_fatal_error_if_required_and_config_not_found'David Cole2012-03-0812-3/+26
| |\ | | | | | | | | | | | | | | | c5ae733 find_package: Test that REQUIRED aborts processing correctly c91a54d find_package: error out if REQUIRED Config has not been found
| | * find_package: Test that REQUIRED aborts processing correctlyBrad King2012-03-0712-3/+26
| | | | | | | | | | | | | | | Verify that the command produces a FATAL_ERROR if and only if the missing package is REQUIRED.
| * | Merge topic 'MakingConfigFilesEasier_ConfigureMacro'David Cole2012-03-082-5/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | 6973e2d wrap write_basic_config_version_file as write_basic_package_version_file() 204f5d4 add CMakePackageConfigHelpers: configure_package_config_file()
| | * | wrap write_basic_config_version_file as write_basic_package_version_file()Alex Neundorf2012-03-071-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So the name fits better with configure_package_config_file(), as discussed on the mailing list. Adapt the documentation accordingly. Alex
| | * | add CMakePackageConfigHelpers: configure_package_config_file()Alex Neundorf2012-03-072-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function configure_package_config_file() may be used instead of configure_file() for generating the Config.cmake files for installation, they help to make those files relocatable. Alex
| * | | Merge topic 'fix-12189-support-SBCS-in-VS'David Cole2012-03-083-0/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b28e7fa VS6: Avoid SBCS test on VS6 (#12189) df19b9c VS6: Avoid _MBCS define when _SBCS is defined (#12189) ba89e92 Visual Studio: Allow setting Single Byte Character Set (#12189)
| | * | | VS6: Avoid SBCS test on VS6 (#12189)David Cole2012-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit, df19b9ca, assumed that the corresponding _UNICODE functionality in the VS6 generator actually worked. That turns out not to be the case. Unicode definition does not actually suppress _MBCS definition, so neither does this new code... Don't test it here, since the patch submitter for _SBCS does not need VS6 support. If somebody needs _UNICODE and _SBCS support to suppress the definition of _MBCS in the VS6 generator, it is work yet to do. Patches welcome.
| | * | | Visual Studio: Allow setting Single Byte Character Set (#12189)Aaron C. Meadows2012-02-173-0/+30
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | For Visual Studio using the Preprocessor Define _SBCS. This behavior is similar to the way that _UNICODE and _MBCS work already. Added tests to confirm this behavior.
| * | | Merge topic 'target-include-directories'David Cole2012-03-083-0/+38
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d662dff Fix shadowed variable warning on dashboard results f66e735 Fix compiler warning reported on older Borland dashboard. d90eed4 Fix compiler error reported on older Borland dashboard. 8233636 Update the documentation regarding INCLUDE_DIRECTORIES. d899eb7 Call ExpandVariablesInString for each target's INCLUDE_DIRECTORIES c21db87 Make search paths ordered and unique 22021f0 Remove cmMakefile::GetIncludeDirectories 9106b56 Extract and use the INCLUDE_DIRECTORIES target properties. 840509b Keep the INCLUDE_DIRECTORIES target property up to date. a4d5f7b Add API to get the ordered includes for a target. 8adaee2 CMake: Eliminate cmMakefile::IncludeDirectories 7620932 Remove include flags memoization. 97a5faa Make it safe to call this method without creating duplicates. edd5303 Refactor GetIncludeFlags to take includes instead of fetching them
| * \ \ \ Merge topic 'test-getpropery'David Cole2012-03-0616-0/+122
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b43cd12 add test for get_property() errors
| | * | | | add test for get_property() errorsRolf Eike Beer2012-03-0416-0/+122
| | | |_|/ | | |/| |
| * | | | Merge topic 'allfindmodules-versions'David Cole2012-03-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 234b7ca AllFindModules test: do not require TCLSH version
| | * | | | AllFindModules test: do not require TCLSH versionRolf Eike Beer2012-03-021-1/+1
| | |/ / /
| * | | | Merge topic 'fix-msys-cvs-local-repo'David Cole2012-03-062-0/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e333602 Fix MSYS CVS local test repo path format (#13001)
| | * | | | Fix MSYS CVS local test repo path format (#13001)Brad King2012-03-022-0/+25
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MSYS cvs tool interprets "c:/" as a "machine:" name for SSH. Detect the MSYS cvs by looking for the string "msys" in the executable file itself. Then convert the repo path to an MSYS path such as "/c/...". Fix both the CTest.UpdateCVS and ExternalProject tests that use local CVS repositories.
| * | | | Merge topic 'remove-CheckSourceTree-cvs-support'David Cole2012-03-062-85/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9012be2 CheckSourceTree: Remove CVS checkout support (#13001)
| | * | | | CheckSourceTree: Remove CVS checkout support (#13001)Brad King2012-03-022-85/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer support CVS checkouts from the Git repository. Drop the case from the CheckSourceTree test. This will also prevent the test from running and failing when CVS is found but Git is not.
| * | | | | Merge topic 'fix-CTestUpdateHG-url'David Cole2012-03-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0916cc8 CTest.UpdateHG: Fix repo URL for local filesystem (#13001)
| | * | | | | CTest.UpdateHG: Fix repo URL for local filesystem (#13001)Brad King2012-03-021-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Use "file:///c:/" instead of "file://c:/" because the latter looks like a machine:port URL instead of a local file URL.
| * | | | | Merge topic 'qt4-deploy'David Cole2012-03-063-37/+154
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4689eed reflect that the QtAutomoc depends on QtGui ab9661c Remove QtGui dependency in Qt4Deploy test and verify QtSql existance. 52e8279 Fix for Qt4Deploy on some test machines. 672e3bb Add test for DeployQt4.cmake 4853e1e Fix plugin installation issues. 35cbf23 Ensure libs are passed to BundleUtilities. 0ac1535 Fix bad plugin paths. a2123e8 Fix mismatched arguments. fc6f340 Don't use QT_LIBRARIES_PLUGINS by default.
| | * | | | reflect that the QtAutomoc depends on QtGuiRolf Eike Beer2012-02-291-1/+1
| | | | | |
| | * | | | Remove QtGui dependency in Qt4Deploy test and verify QtSql existance.Clinton Stimpson2012-02-293-3/+3
| | | | | |
| | * | | | Fix for Qt4Deploy on some test machines.Clinton Stimpson2012-02-241-38/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same check for whether Qt4 works for Qt4Automoc test before trying to do the Qt4Deploy test. Also pass down to Qt4Deploy which Qt to use.
| | * | | | Add test for DeployQt4.cmakeClinton Stimpson2012-02-233-0/+120
| | | |_|/ | | |/| |
| * | | | Merge topic 'while-testing'David Cole2012-03-027-0/+60
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 944b90b add testcases for while()/endwhile() errors f605b92 improve error message on a stray "endwhile()"
| | * | | | add testcases for while()/endwhile() errorsRolf Eike Beer2012-03-017-0/+60
| | | |/ / | | |/| |
| * | | | Merge topic 'allfindmodules-versions'David Cole2012-03-021-18/+24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9271d2f AllFindModules test: once again expand version checking
| | * | | | AllFindModules test: once again expand version checkingRolf Eike Beer2012-03-011-18/+24
| | |/ / /
| * | | | Merge topic 'inject_code_via_variable'David Cole2012-03-024-1/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2557a08 Fix typo in error message, and remove redundent test. 9090572 Add ability to include a file in a project via a cache variable.
| | * | | | Fix typo in error message, and remove redundent test.Bill Hoffman2012-03-011-2/+0
| | | | | |
| | * | | | Add ability to include a file in a project via a cache variable.Bill Hoffman2012-02-174-1/+15
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | If a variable exists called CMAKE_PROJECT_<projectName>_INCLUDE, the file pointed to by that variable will be included as the last step of the project command.
| * | | | Merge topic 'find_package-improve-messages'David Cole2012-03-0231-0/+318
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eeaaffc find_package: Test error and warning messages in failure cases 52dffb9 Merge branch 'test-CMakeCommands' into find_package-improve-messages d365104 find_package: Optionally warn when implicitly using Config mode 31ead5f find_package: Reject mixed use of MODULE- and CONFIG-only options 6d83083 find_package: mention requested version number in error message 9c39bbd find_package: add CONFIG mode keyword alias for NO_MODULE f310f67 find_package: add MODULE mode to use only Find-modules 7d67dcf find_package: improve error message when no Find module is present 978d89b find_package: rename NoModule to UseFindModules
| | * | | | find_package: Test error and warning messages in failure casesBrad King2012-02-2831-0/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a "CMakeCommands.find_package" test to run CMake on a bunch of cases in which find_package fails. Check that the process return code and warning/error messages are as expected. Record expected test output in corresponding files for reference by the check. These files will also serve as a reference for the message text in each case.
| * | | | | Merge topic 'test-CMakeCommands'David Cole2012-03-023-7/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | 5e1a5c4 Add infrastructure for CMakeCommands tests
| | * | | | Add infrastructure for CMakeCommands testsBrad King2012-02-283-7/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | Generalize the build_command test framework as a macro to add the test. Process the CMakeCommands subdirectory explicitly.
| * | | | Tests: Escape metachars before embedding paths into the regex (#12999)Modestas Vainius2012-02-271-2/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ${CMake_SOURCE_DIR} and ${CMake_BINARY_DIR} cannot be embedded into regex directly. If they contain special regex metacharacters like +, the regex will break. So just escape such metacharacters with a backslash before embedding the path into the regex. The issue affected the following tests: CTestTestConfigFileInBuildDir1 and CTestTestConfigFileInBuildDir2.
* | | | Merge branch 'target-include-directories' into ninja-generatorDavid Cole2012-02-2228-130/+409
|\ \ \ \ | | |_|/ | |/| |
| * | | Extract and use the INCLUDE_DIRECTORIES target properties.Stephen Kelly2012-02-223-0/+38
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Eliminate callers of cmMakefile::GetIncludeDirectories. All callers of GetIncludeDirectories should go through the local generator object. Only the local generator calls cmTarget::GetIncludeDirectories directly.
| * | Merge topic 'HandleTargetsInCMakeRequiredLibraries'David Cole2012-02-211-0/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 61cb4ea bootstrap: move while() and endwhile() into the bootstrap build c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built 628f365 -remove trailing whitespace
| | * | Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIESAlex Neundorf2012-02-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the function cmake_expand_imported_targets() to expand imported targets in a list of libraries into their on-disk file names for a particular configuration. Adapt the implementation from KDE's HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES which has been in use for over 2 years. Call the function from all the Check*.cmake macros to handle imported targets named in CMAKE_REQUIRED_LIBRARIES. Alex
| * | | Merge topic 'doBuildRPM-withSpaceInTree'David Cole2012-02-211-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 6749450 Do not build RPM if path of the build tree contains space
| | * | | Do not build RPM if path of the build tree contains spaceEric NOULARD2012-02-191-0/+8
| | | |/ | | |/|
| * | | Merge topic 'expect-more-versions'David Cole2012-02-211-2/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 540db7e AllFindModules test: expect more modules to have a version number available
| | * | | AllFindModules test: expect more modules to have a version number availableRolf Eike Beer2012-02-181-2/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | For all current build machines the modules FindPkgConfig, FindFreetype, and FindLibXslt return a version number. Enforce this to early catch when this is not always the case.
| * | | Merge topic 'findlibrary-versioned-libraries'David Cole2012-02-211-1/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 70f3623 Find_library(): allow searching for versioned shared objects
| | * | | Find_library(): allow searching for versioned shared objectsRolf Eike Beer2012-02-181-1/+31
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This did not work because find_library() did only treat the given name as complete filename if is matched "PREFIX.*SUFFIX": find_library(MYLIB libfoo.so.2) Now it is also taken as a whole if the name matches "PREFIX.*SUFFIX\..*".