feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Wizard: Fix test registration to ctest

Browse Source 
Change-Id: Ia30cdf1ce690a2ebbc2e991e4e3f8a029e4768ed
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-12-05 08:36:08 +01:00
parent f021680513
commit 2375dcab67
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/templates/wizards/autotest/files/tst.txt
View File

@@ -20,7 +20,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
enable_testing() enable_testing()
add_executable(%{TestCaseName} %{TestCaseFileWithCppSuffix}) add_executable(%{TestCaseName} %{TestCaseFileWithCppSuffix})
add_test(%{TestCaseName} COMMAND %{TestCaseName}) add_test(NAME %{TestCaseName} COMMAND %{TestCaseName})
@if "%{RequireGUI}" == "true" @if "%{RequireGUI}" == "true"
target_link_libraries(%{TestCaseName} PRIVATE Qt5::Gui Qt5::Test) target_link_libraries(%{TestCaseName} PRIVATE Qt5::Gui Qt5::Test)
@@ -46,7 +46,7 @@ enable_testing()
add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
add_executable(%{TestCaseName} %{MainCppName}) add_executable(%{TestCaseName} %{MainCppName})
add_test(%{TestCaseName} COMMAND %{TestCaseName}) add_test(NAME %{TestCaseName} COMMAND %{TestCaseName})
target_link_libraries(%{TestCaseName} PRIVATE Qt5::QuickTest) target_link_libraries(%{TestCaseName} PRIVATE Qt5::QuickTest)
@@ -91,7 +91,7 @@ include_directories(${GTestIncludes})
add_executable(%{TestCaseName} %{MainCppName} %{TestCaseFileWithHeaderSuffix} add_executable(%{TestCaseName} %{MainCppName} %{TestCaseFileWithHeaderSuffix}
${GTestFiles}) ${GTestFiles})
add_test(%{TestCaseName} COMMAND %{TestCaseName}) add_test(NAME %{TestCaseName} COMMAND %{TestCaseName})
target_link_libraries(%{TestCaseName} PRIVATE Threads::Threads) target_link_libraries(%{TestCaseName} PRIVATE Threads::Threads)
@endif @endif
@@ -103,7 +103,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
enable_testing() enable_testing()
add_executable(%{TestCaseName} %{MainCppName}) add_executable(%{TestCaseName} %{MainCppName})
add_test(%{TestCaseName} COMMAND %{TestCaseName}) add_test(NAME %{TestCaseName} COMMAND %{TestCaseName})
if (DEFINED ENV{BOOST_INCLUDE_DIR}) if (DEFINED ENV{BOOST_INCLUDE_DIR})
set(BOOST_INCLUDE_DIR $ENV{BOOST_INCLUDE_DIR}) set(BOOST_INCLUDE_DIR $ENV{BOOST_INCLUDE_DIR})