diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-08 16:29:23 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-12-13 12:48:27 (GMT) |
| commit | 0b8597a86ee8bed2c34f52d309fd57b5f29a1595 (patch) | |
| tree | 912e41e02cc0e562fca2caa9897e1e850359611b /Tests/QtAutogen/TestMacros.cmake | |
| parent | 227a7974f426e0966d1736c66dd606b068985d1b (diff) | |
| download | CMake-0b8597a86ee8bed2c34f52d309fd57b5f29a1595.zip CMake-0b8597a86ee8bed2c34f52d309fd57b5f29a1595.tar.gz CMake-0b8597a86ee8bed2c34f52d309fd57b5f29a1595.tar.bz2 | |
Autogen: Tests: Separate mocOnly and mocOnlyOpts tests
Diffstat (limited to 'Tests/QtAutogen/TestMacros.cmake')
| -rw-r--r-- | Tests/QtAutogen/TestMacros.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Tests/QtAutogen/TestMacros.cmake b/Tests/QtAutogen/TestMacros.cmake index 849a733..966f3b8 100644 --- a/Tests/QtAutogen/TestMacros.cmake +++ b/Tests/QtAutogen/TestMacros.cmake @@ -41,9 +41,8 @@ macro(ADD_AUTOGEN_TEST NAME) unset(_BuildDir) endmacro() - # Allow using qtx_wrap_cpp and qtx_generate_moc or not -set(ALLOW_WRAP_CPP TRUE) +set(QT_TEST_ALLOW_QT_MACROS TRUE) # Do a simple check if there is are non ASCII character in the build path string(REGEX MATCH "[^ -~]+" NON_ASCII_BDIR ${CMAKE_CURRENT_BINARY_DIR}) if(NON_ASCII_BDIR) @@ -51,11 +50,11 @@ if(NON_ASCII_BDIR) # qtx_wrap_cpp # https://bugreports.qt.io/browse/QTBUG-35480 if(QT_TEST_VERSION STREQUAL 4) - set(ALLOW_WRAP_CPP FALSE) + set(QT_TEST_ALLOW_QT_MACROS FALSE) endif() # On windows qtx_wrap_cpp also fails in Qt5 when used on a path that # contains non ASCII characters if(WIN32) - set(ALLOW_WRAP_CPP FALSE) + set(QT_TEST_ALLOW_QT_MACROS FALSE) endif() endif() |