summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Fail early on when ninja build tool does not runBrad King2016-10-204-0/+13
| | | | | | | | Diagnose failure to run `ninja --version` and abort early. Otherwise we end up aborting with a confusing message about ninja version "" being too old. Closes: #16378
* Merge topic 'propagate_ctest_use_launchers'Brad King2016-10-183-0/+7
|\ | | | | | | | | 19beee46 ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to project
| * ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to projectBill Hoffman2016-10-173-0/+7
| | | | | | | | | | | | | | | | If `CTEST_USE_LAUNCHERS` is `TRUE` in a CTest script then the `ctest_configure` command will add `-DCTEST_USE_LAUNCHERS:BOOL=TRUE` to the cmake command used to configure the project. This allows a project to only set `CTEST_USE_LAUNCHERS` in a ctest script and have launchers work.
* | cmTarget: Move sanity checks and computed property access to callersStephen Kelly2016-10-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GetProperty method is now just accessing contained data, meaning it can be implemented in cmState. Remove the cmMakefile context from the signature as a result and remove the overload with the same signature. Add a GetComputedProperty to cmTarget so that templates can be properly instantiated. Otherwise the Commands would need to be able to reach the specializations which are currently in cmTarget.cxx. As a side-effect, the CMP0026 warning now gives a backtrace to the target when issued from a generator expression.
* | Merge topic 'vs-host-x64-tools'Brad King2016-10-1410-0/+39
|\ \ | | | | | | | | | | | | | | | d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
| * | VS: Provide an option to use x64 host toolsBrad King2016-10-1410-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio provides toolchains that are themselves built for 32-bit or 64-bit host architectures. By default it uses the 32-bit tools, but it can be told to prefer the 64-bit tools on 64-bit hosts. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a way to request use of the 64-bit host tools. Closes: #15622
* | | Merge topic 'ExternalProject-fix-CMAKE_CACHE_ARGS-list'Brad King2016-10-134-2/+24
|\ \ \ | | | | | | | | | | | | | | | | a3c98cb3 ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGS
| * | | ExternalProject: Fix regression in passing list to CMAKE_CACHE_ARGSMax Smolens2016-10-104-2/+24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix passing a list to the CMAKE_CACHE_ARGS and CMAKE_CACHE_DEFAULT_ARGS options of ExternalProject_Add. Following commit v3.7.0-rc1~273^2~1 (prefer list(APPEND) over string(APPEND) where appropriate, 2016-08-08), the semicolon list separator after the first list element was missing in the generated cache.
* | | Merge topic 'test-cpack-improve-failure-messages'Brad King2016-10-101-2/+4
|\ \ \ | | | | | | | | | | | | | | | | 7f90d5e5 Tests: Improve RunCMake.CPack_* failure message formatting
| * | | Tests: Improve RunCMake.CPack_* failure message formattingBrad King2016-10-071-2/+4
| | |/ | |/| | | | | | | | | | | | | Format a `message(FATAL_ERROR)` call with markup to make the generated message more readable so that the difference between the actual and expected results is easier to see.
* | | Merge topic 'android-export-has-cpp'Brad King2016-10-104-1/+10
|\ \ \ | | | | | | | | | | | | | | | | dda6775c Android: Record use of C++ by static libs in exported Android.mk files
| * | | Android: Record use of C++ by static libs in exported Android.mk filesBrad King2016-10-074-1/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | When a `PREBUILT_STATIC_LIBRARY` uses C++ in its sources then the `.a` file will have a link-time dependency on the C++ runtime libraries. Android NDK r14 will add a way to give this information to the NDK build system by adding a `LOCAL_HAS_CPP` setting to the `Android.mk` file. Add this for exported static libraries that use C++.
* | | Merge topic 'android-cxxabi'Brad King2016-10-102-0/+5
|\ \ \ | |_|/ |/| | | | | | | | 8cdac469 Android: Fix support for cxxabi.h with libc++
| * | Android: Fix support for cxxabi.h with libc++Brad King2016-10-072-0/+5
| | | | | | | | | | | | | | | | | | Additional include directories are needed for this on some STL types. Closes: #16350
* | | CPack/RPM single debuginfo packagingDomen Vrankar2016-10-0710-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | Generate a single debuginfo package even if components packaging is enabled. This makes issue #15668 resolution feature complete. Closes: #15486
* | | CPack/RPM learned defining main componentDomen Vrankar2016-10-075-0/+32
|/ / | | | | | | | | | | Main component rpm package is generated without component suffix in filename and package name.
* | Android: Suppress -Wattributes warnings in test case buildsBrad King2016-10-061-2/+2
|/ | | | | | | | | | | | | | We use `-Werror` in the Android test builds to make sure there are no warnings that we care about (e.g. unused flags). However, the NDK r13 tools produce a warning about their own builtins: ``` <built-in>: In function 'float abs(float)': <built-in>: warning: conflicts with previous declaration here [-Wattributes] ``` Suppress this warning so that we can continue using `-Werror` but tolerate these warnings.
* Merge topic 'add-setup-projects-tests-module'Brad King2016-10-0116-0/+148
|\ | | | | | | | | 130784e0 AndroidTestUtilities: Add module to help drive Android device tests
| * AndroidTestUtilities: Add module to help drive Android device testsSchuyler Kylstra2016-09-3016-0/+148
| | | | | | | | | | | | Add a module to manage the data needed for the project tests. It will move the test data to the build directory and transfer necessary data to an Android device if that is enabled.
* | Merge topic 'cmake_parse_arguments-PARSE_ARGV-multi-value'Brad King2016-09-295-19/+92
|\ \ | | | | | | | | | | | | | | | 66c70cd9 cmake_parse_arguments: Add additional unit tests 41291b20 cmake_parse_arguments: Fix PARSE_ARGV multi-value argument handling
| * | cmake_parse_arguments: Add additional unit testsMatthew Woehlke2016-09-285-29/+84
| | | | | | | | | | | | Add additional unit tests for some corner cases in argument splitting.
| * | cmake_parse_arguments: Fix PARSE_ARGV multi-value argument handlingMatthew Woehlke2016-09-281-2/+20
| |/ | | | | | | | | | | | | | | | | The `PARSE_ARGV` mode was recently added to help functions properly parse their arguments even when those arguments may be quoted and contain literal `;` in their values. Fix the implementation to encode `;`s in reported multi-value arguments and in `UNPARSED_ARGUMENTS` so that `;`s in the individual values are preserved in the lists. This allows clients to access all their argument values correctly.
* | Merge topic 'fix-explicit-RC'Brad King2016-09-293-1/+5
|\ \ | | | | | | | | | | | | | | | 9c5238df project: Fix support for explicit RC language 40c04821 Tests: Decide earlier whether to test resources
| * | project: Fix support for explicit RC languageBrad King2016-09-283-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added in commit v3.6.0-rc1~293^2 (Diagnose recursive project/enable_language without crashing, 2016-03-07) broke support for enabling `RC` explicitly along with other languages like `C`. The reason is that we enable all listed languages at once so the internal `enable_language(RC)` that we do while enabling `C` or `CXX` on some platforms triggers the recursion check if `RC` is explicitly listed. Ideally we should refactor things to only enable one language at a time, but for now it is simplest to just exclude `RC` from the explicit list until other languages are enabled, and then enable it. Closes: #16330
* | Tests: Add newline to RunCMake.CPack_RPM SOURCE_PACKAGE caseBrad King2016-09-281-1/+1
|/ | | | | | The `main.cpp` that this test generates needs a newline so that compilers do not warn about a missing newline. Otherwise the warning causes RunCMake infrastructure to detect unexpected output.
* Tests: Fix RunCMake.CTest output match to tolerate line number changesBrad King2016-09-271-3/+3
|
* Merge topic 'cpack-rpm-debuginfo-sources'Brad King2016-09-272-2/+10
|\ | | | | | | | | | | | | 39c7d62c CPack/RPM debuginfo packaging documentation dd3c938a CPack/RPM debuginfo directories to sources b78fcf0d CPack/RPM debuginfo packages must contain sources
| * CPack/RPM debuginfo directories to sourcesDomen Vrankar2016-09-271-2/+2
| | | | | | | | | | | | List of sources must be split into paths parts so that debuginfo package cleans up after itself.
| * CPack/RPM debuginfo packages must contain sourcesDomen Vrankar2016-09-272-2/+10
| | | | | | | | | | Issue #15668 fix was missing relevant source files in debuginfo package.
* | Fix XCODE_ATTRIBUTE_..._LOCATION target property lookupBrad King2016-09-223-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~272^2~16 (cmGeneratorTarget: Add API for property keys, 2015-10-25) changed the Xcode generator implementation of `XCODE_ATTRIBUTE_...` properties to use the target `GetProperty` method on each `XCODE_ATTRIBUTE_...` property listed by `GetPropertyKeys` instead of looping over the property entries directly. This made the lookup of property names of the form `XCODE_ATTRIBUTE_..._LOCATION` accidentally trigger the computed property logic for the undocumented/legacy `<CONFIG>_LOCATION` property. Of course the computed property value is not the same as the value stored in the `XCODE_ATTRIBUTE_..._LOCATION` property. Fix the computed property logic to avoid triggering on `XCODE_ATTRIBUTE_...` attributes. Closes: #16319
* | Merge topic 'test-fixtures'Brad King2016-09-2216-0/+207
|\ \ | | | | | | | | | | | | 73f47c9e CTest: Add support for test fixtures
| * | CTest: Add support for test fixturesCraig Scott2016-09-2016-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new test properties: * FIXTURES_SETUP * FIXTURES_CLEANUP * FIXTURES_REQUIRED to specify the roles and dependencies of tests providing/using test fixtures.
* | | server-mode: Introduce cmServerConnectionTobias Hunger2016-09-223-0/+3
| |/ |/| | | | | | | | | | | | | Use it to split pipe and stdin/out handling out of cmServer itself. The server will shut down when it looses its connection to the client. This has the nice property that a crashing client will cause the server to terminate as the OS will close the connection on behave of the client.
* | Merge topic 'ctest-capture-error'Brad King2016-09-219-0/+48
|\ \ | | | | | | | | | | | | | | | | | | adf1e32f Help: Add notes for topic 'ctest-capture-error' d328dc68 CTest: Add CAPTURE_CMAKE_ERROR val to `ctest_*` commands 9ac2e189 ctest_coverage: If gcov is not found just warn, not error
| * | CTest: Add CAPTURE_CMAKE_ERROR val to `ctest_*` commandsBill Hoffman2016-09-209-0/+48
| | | | | | | | | | | | | | | | | | | | | If a `ctest_*` command has CAPTURE_CMAKE_ERROR then any errors generated by cmake during that command will cause the value to be assigned `-1`. This will prevent a `ctest -S` script from returning non-zero unless the script explicitly calls `message(FATAL_ERROR)`.
* | | Merge topic 'runcmake-cpack-test-framework-fix'Brad King2016-09-211-70/+17
|\ \ \ | |_|/ |/| | | | | | | | cb851a7c Tests: Fix RunCMake.CPack test infrastructure after logical conflict
| * | Tests: Fix RunCMake.CPack test infrastructure after logical conflictDomen Vrankar2016-09-201-70/+17
| | | | | | | | | | | | | | | | | | | | | | | | The changes in commit d9cec8ad (CPack/RPM: Generate source rpm (SRPM) packages on demand, 2016-09-19) logically conflict with the infrastructure updates in commit 4682b42b (Tests: Add subtest support to RunCMake/CPack infrastructure, 2016-09-13). Integrate the two changes so they work together.
* | | Merge topic 'directory-list-targets-and-subdirs'Brad King2016-09-205-1/+38
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | d0be1e15 Add directory properties to get source and binary directories cbca6582 Add directory property to list buildsystem targets 7a4b8d0d Add a directory property to list subdirectories 089868a2 cmState: Record buildsystem target names in each directory
| * | Add directory properties to get source and binary directoriesBrad King2016-09-192-1/+14
| | | | | | | | | | | | | | | | | | Add SOURCE_DIR and BINARY_DIR directory properties that return the absolute paths to the corresponding directories. These correspond to the target properties of the same names that we already have.
| * | Add directory property to list buildsystem targetsBrad King2016-09-193-1/+15
| | | | | | | | | | | | | | | Add a BUILDSYSTEM_TARGETS property to allow project code to traverse the list of its own targets in a given directory.
| * | Add a directory property to list subdirectoriesBrad King2016-09-195-1/+11
| | | | | | | | | | | | | | | Add a SUBDIRECTORIES directory property to allow project code to traverse the directory structure of itself as CMake sees it.
* | | Merge topic 'cpack-rpm-srpm-package'Brad King2016-09-206-1/+145
|\ \ \ | | | | | | | | | | | | | | | | d9cec8ad CPack/RPM: Generate source rpm (SRPM) packages on demand
| * | | CPack/RPM: Generate source rpm (SRPM) packages on demandDomen Vrankar2016-09-206-1/+145
| |/ / | | | | | | | | | Closes: #15839
* | | Merge topic 'cpack.hash_computing'Brad King2016-09-208-12/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1c63aa4d CPack: Add option to generate a checksum file next to each package file 4682b42b Tests: Add subtest support to RunCMake/CPack infrastructure
| * | | CPack: Add option to generate a checksum file next to each package filePetr Orlov2016-09-195-0/+30
| | | | | | | | | | | | | | | | Add variable CPACK_PACKAGE_CHECKSUM to activate it.
| * | | Tests: Add subtest support to RunCMake/CPack infrastructureDomen Vrankar2016-09-193-12/+40
| |/ /
* | | server-mode: Add --experimental flagTobias Hunger2016-09-201-1/+1
|/ / | | | | | | | | | | | | | | Allow for experimental cmProtocolVersions, which will only ever get listed if the server was started with the (undocumented) "--experimental" flag. Mark current protocol version 1.0 as experimental.
* | cmake-server: Bare-bones server implementationTobias Hunger2016-09-193-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a bare-bones cmake-server implementation and makes it possible to start that with "cmake -E server". Communication happens via stdin/stdout for now. Protocol is based on Json objects surrounded by magic strings ("[== CMake Server ==[" and "]== CMake Server ==]"), which simplifies Json parsing significantly. This patch also defines an interface used to implement different versions of the protocol spoken by the server, but does not include any protocol implementaiton.
* | Make the add_custom_command output more predictableStephen Kelly2016-09-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I otherwise get: Expected stderr to match: expect-err> CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\): expect-err> add_custom_command given APPEND option with output.* expect-err> which is not already a custom command output. expect-err> Call Stack \(most recent call first\): expect-err> CMakeLists.txt:3 \(include\) Actual stderr: actual-err> CMake Error at AppendNotOutput.cmake:1 (add_custom_command): actual-err> add_custom_command given APPEND option with output actual-err> "/home/stephen/dev/src/cmake/with actual-err> space/Tests/RunCMake/add_custom_command/AppendNotOutput-build/out" which is actual-err> not already a custom command output. actual-err> Call Stack (most recent call first): actual-err> CMakeLists.txt:3 (include) Using a specific line for paths is a style already used elsewhere for the same reason, such as CMP0041 output.
* | Merge topic 'file-curl-httpheader'Brad King2016-09-167-0/+14
|\ \ | | | | | | | | | | | | 8f6cb366 file(DOWNLOAD|UPLOAD): Add HTTPHEADER suboption