summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2013-10-291-1/+1
|
* Merge topic 'Qt-auto-generators'Brad King2013-10-2866-205/+1228
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9c87d9c Add automatic rcc invocation for Qt. 84218e1 Add automatic uic invocation for Qt. 94a0ca6 Record which files are skipped by automoc. 18fb758 Run the main executable created in the autogen tests. e485ba1 Rename the QtAutomoc tests to QtAutogen. 7ce65c3 Add extra checks for the AUTOMOC target property. 32771fc Update output messages for generic use. f371ab5 Rename RunAutomoc to RunAutogen. 85b3d6e Extract an SetupAutoMocTarget method. ca124a1 Rename the AutomocInfo.cmake file to be more generic. a342c9f Move some makefile definitions up away from moc-specific code. 98632ef Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER. 63378ba Rename some variables to reflect broader scope. 97f1aa3 Rename method to reflect generic use. 4abb111 Rename local variable to reflect generic use. 03878c9 Move variable set to where it is used. ...
| * Add automatic rcc invocation for Qt.Stephen Kelly2013-10-2417-10/+426
| | | | | | | | | | This replaces the need to invoke qt4_add_resources by allowing adding the source .qrc file directly to the target sources.
| * Add automatic uic invocation for Qt.Stephen Kelly2013-10-2419-14/+559
| | | | | | | | | | | | | | | | | | | | | | | | The source files are already processed by cmQtAutomoc to look for moc includes, so extend that to also look for ui_ includes and find corresponding .ui files to process. This replaces the need to invoke qt4_wrap_ui(). As the ui files are not likely to be part of the SOURCES of the target, store the options associated with them separately in the cmMakefile for querying during the autogen run.
| * Record which files are skipped by automoc.Stephen Kelly2013-10-242-12/+27
| | | | | | | | They may not be skipped by autouic.
| * Run the main executable created in the autogen tests.Stephen Kelly2013-10-243-8/+16
| | | | | | | | | | | | | | | | | | | | Don't try to show the windows, which would require a gui capable test machine, and that's not guaranteed. Automatically link to qtmain.a on Windows to avoid a policy warning. Set policy CMP0020 to NEW by increasing the required version. Don't attempt to run the test when using Windows.
| * Rename the QtAutomoc tests to QtAutogen.Stephen Kelly2013-10-2437-13/+13
| |
| * Add extra checks for the AUTOMOC target property.Stephen Kelly2013-10-241-14/+21
| | | | | | | | In an upcoming commit, this class will be used even if it is not set.
| * Update output messages for generic use.Stephen Kelly2013-10-241-14/+14
| |
| * Rename RunAutomoc to RunAutogen.Stephen Kelly2013-10-242-3/+3
| | | | | | | | It will soon be used to process ui and rcc files too.
| * Extract an SetupAutoMocTarget method.Stephen Kelly2013-10-242-48/+61
| | | | | | | | This class will soon gain methods for autouic and autorcc.
| * Rename the AutomocInfo.cmake file to be more generic.Stephen Kelly2013-10-242-3/+3
| |
| * Move some makefile definitions up away from moc-specific code.Stephen Kelly2013-10-241-22/+21
| |
| * Add the AUTOGEN_TARGETS_FOLDER and obsolete AUTOMOC_TARGETS_FOLDER.Stephen Kelly2013-10-244-3/+19
| |
| * Rename some variables to reflect broader scope.Stephen Kelly2013-10-241-8/+9
| |
| * Rename method to reflect generic use.Stephen Kelly2013-10-242-3/+3
| |
| * Rename local variable to reflect generic use.Stephen Kelly2013-10-241-8/+8
| |
| * Move variable set to where it is used.Stephen Kelly2013-10-241-2/+1
| |
| * Rename the cmake_automoc command to cmake_autogen.Stephen Kelly2013-10-242-2/+2
| | | | | | | | | | | | There is no need for a "cmake_automoc" backward compatibility command because it is internal, undocumented, and only executed from a matching version of cmake.
| * Rename the cmQtAutoGenerator instances to reflect coming features.Stephen Kelly2013-10-242-9/+9
| |
| * Rename the cmQtAutomoc class to cmQtAutoGenerators.Stephen Kelly2013-10-246-38/+42
| | | | | | | | It will be extended to process .ui and .qrc files too.
* | Merge topic 'enable-language-require-compiler'Brad King2013-10-2835-39/+233
|\ \ | | | | | | | | | | | | | | | | | | 3e04946 Require CMAKE_<LANG>_COMPILER to be found as a full path 6007f7c CMakeDetermineCompilerId: Always use compiler detected from IDE 332771c CMakeDetermine*Compiler: Remove temporary cache entry
| * | Require CMAKE_<LANG>_COMPILER to be found as a full pathBrad King2013-10-2830-29/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All generators now support detection of the full path to the compiler, so require it to be so. This will allow CMake<LANG>Information.cmake and other logic to assume the full path to the compiler tool is available. The Makefile generators already rejected CMAKE_<LANG>_COMPILER values that did not name an existing compiler. Extend this error message to all generators, make it occur as early as possible, and improve the message with advice about how to set the compiler. If the full path to the compiler is not known, finish enabling languages with a fatal error so configuration does not continue. For now, allow the RC language compiler to not be a full path. Later we will need to detect the full path to "rc" under the VS IDE. Add a RunCMake.CompilerNotFound test to cover failure cases. Fix the RunCMake.CompilerChange test EmptyCompiler case to work when configuration does not continue past enable_language.
| * | CMakeDetermineCompilerId: Always use compiler detected from IDEBrad King2013-10-281-6/+4
| | | | | | | | | | | | | | | | | | | | | When compiler id detection also provides a CMAKE_<LANG>_COMPILER value, use it unconditionally. It is known to be the compiler that is actually in use by IDE builds in VS and Xcode. Do not let a stray cache entry try to say otherwise.
| * | CMakeDetermine*Compiler: Remove temporary cache entryBrad King2013-10-244-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | When the user or toolchain file sets CMAKE_<LANG>_COMPILER to a name without a path we use find_program with CMAKE_<LANG>_COMPILER_WITH_PATH to search for the tool. Remove the temporary cache entry afterward to avoid exposing it to projects. It is not set by other logic paths so no one should be using it.
* | | Merge topic 'restore-serial-failed-test-order'Brad King2013-10-281-3/+4
|\ \ \ | | | | | | | | | | | | | | | | 2b5c9da CTest: restore old failed test priority in serial test runs
| * | | CTest: restore old failed test priority in serial test runsNils Gladitz2013-10-271-3/+4
| | | |
* | | | Merge topic 'locale-independent-date-in-test'Brad King2013-10-281-132/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0655d09 Tests: use string(TIMESTAMP) instead of system and locale specific date/time
| * | | | Tests: use string(TIMESTAMP) instead of system and locale specific date/timeNils Gladitz2013-10-261-132/+31
| | | | |
* | | | | Merge topic 'ninja-use-deps'Brad King2013-10-2811-77/+158
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | eeb4aec Ninja: use deps = gcc/msvc feature
| * | | | | Ninja: use deps = gcc/msvc featurePeter Kümmel2013-10-2411-77/+158
| | | | | | | | | | | | | | | | | | | | | | | | cmcldeps is now only used for .rc file processing
* | | | | | CMake Nightly Date StampKitware Robot2013-10-281-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-10-271-1/+1
| |/ / / |/| | |
* | | | Merge topic 'ctest-fix-run-serial'Brad King2013-10-265-59/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff59365 CTest: fix dashboard issues associated with the ctest-fix-run-serial topic 7a665ae CTest: added test for RUN_SERIAL issue #14484 384beff CTest: added comments that describe the basic test sorting approach adbe00d CTest: removed redundant copy of test dependency set 1b750cb CTest: perform cycle test early 6d4d7ca CTest: consider previously failed tests before all others e809d8c CTest: prioritize tests by their depth in the dependency graph 44017a4 CTest: handle dependent and non dependent test requirements equally
| * | | | CTest: fix dashboard issues associated with the ctest-fix-run-serial topicNils Gladitz2013-10-253-8/+24
| | | | |
| * | | | CTest: added test for RUN_SERIAL issue #14484Nils Gladitz2013-10-213-0/+39
| | | | |
| * | | | CTest: added comments that describe the basic test sorting approachNils Gladitz2013-10-211-0/+7
| | | | |
| * | | | CTest: removed redundant copy of test dependency setNils Gladitz2013-10-211-7/+1
| | | | |
| * | | | CTest: perform cycle test earlyNils Gladitz2013-10-192-1/+8
| | | | |
| * | | | CTest: consider previously failed tests before all othersNils Gladitz2013-10-191-15/+10
| | | | |
| * | | | CTest: prioritize tests by their depth in the dependency graphNils Gladitz2013-10-181-4/+45
| | | | |
| * | | | CTest: handle dependent and non dependent test requirements equallyNils Gladitz2013-10-171-40/+9
| | | | |
* | | | | Merge topic 'ctest-p4'Brad King2013-10-2611-2/+969
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 970c823 ctest_update: Add support for Perforce p4 client
| * | | | | ctest_update: Add support for Perforce p4 clientPedro Navarro2013-10-2611-2/+969
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the ctest_update implementation to use the p4 command-line client to perform updates and extract the list of changes. Add a CTest.UpdateP4 test like those that exist already for the other version control tools. Make the test available when p4 and the p4d server are found. During the test launch p4d in the background to serve a repository from the test directory. Then direct the client toward this server for the duration of the test.
* | | | | | Merge topic 'less-versioned-installs'Brad King2013-10-262-4/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1093dee Shorten CMake version used in install destinations
| * | | | | | Shorten CMake version used in install destinationsBrad King2013-10-252-4/+12
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c9a5f34b (Cleanup use of CMake version in install destinations, 2013-09-26) we use the full CMake version in default install destinations. For rapidly changing versions of the form <major>.<minor>.<patch>.<date>-g<commit>[-dirty] used by developers this is too granular. Instead use just <major>.<minor>.<patch> as the version for default install destinations. This will still be granular enough for unique directories in releases. On Cygwin continue to use the full ${CMake_VERSION} as was the case prior to the above-mentioned commit.
* | | | | | Merge topic 'clang-binutils'Brad King2013-10-262-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b84f5c2 Find appropriate binutils when cross-compiling with clang
| * | | | | | Find appropriate binutils when cross-compiling with clangStephen Kelly2013-10-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One way to use clang as a cross-compiler is to create a symlink named <target>-clang, which is equivalent to running clang -target <target> Extract the toolchain prefix to find the binutils executables.
* | | | | | | Merge topic 'QNX-ninja-generator'Brad King2013-10-261-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02cf77f QNX: Don't attempt to create depfiles
| * | | | | | | QNX: Don't attempt to create depfilesStephen Kelly2013-10-251-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qcc driver can not handle the flags. This makes it possible to use qcc with the Ninja generator.