diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
| commit | 8018fcca6e055a0f12a17fc8324128080a9ec568 (patch) | |
| tree | accecb14f80dece735e2822b76ad0c88825149b6 /Tests/CTestTestUpload/test.cmake.in | |
| parent | a41c0a9dcbc201b183bcc0a0c0f6bf9f2cebd079 (diff) | |
| parent | 5ada4be81bdb7695b2a4741db76ec66473ccd961 (diff) | |
| download | CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.zip CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.gz CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.bz2 | |
Merge branch 'master' into revise-compiler-id-policies
Diffstat (limited to 'Tests/CTestTestUpload/test.cmake.in')
| -rw-r--r-- | Tests/CTestTestUpload/test.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CTestTestUpload/test.cmake.in b/Tests/CTestTestUpload/test.cmake.in index 340877f..bb6ba25 100644 --- a/Tests/CTestTestUpload/test.cmake.in +++ b/Tests/CTestTestUpload/test.cmake.in @@ -7,8 +7,8 @@ set(CTEST_BUILD_NAME "CTestTest-@BUILDNAME@-Upload") set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTestUpload") set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTestUpload") -set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@") -set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_TEST_GENERATOR_TOOLSET@") +set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@") +set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@") set(CTEST_BUILD_CONFIGURATION "$ENV{CMAKE_CONFIG_TYPE}") CTEST_START(Experimental) |