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

Wizard: Fix AutoTest wizard for Boost with CMake

Browse Source 
While at it use the same environment variable used for
Qmake or Qbs based project.

Change-Id: Ieefb4e1da4ce4155863b80a1b275b67e664273c6
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-05-24 08:49:34 +02:00
parent 7418c4f1ee
commit 675ac662e9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,12 +82,14 @@ ENABLE_TESTING()
add_executable(${PROJECT_NAME} %{MainCppName}) add_executable(${PROJECT_NAME} %{MainCppName})
add_test(${PROJECT_NAME} COMMAND ${PROJECT_NAME}) add_test(${PROJECT_NAME} COMMAND ${PROJECT_NAME})
if ($ENV{BOOST_INC_DIR}) if (DEFINED ENV{BOOST_INCLUDE_DIR})
set(BOOST_INC_DIR $ENV{BOOST_INC_DIR}) set(BOOST_INCLUDE_DIR $ENV{BOOST_INCLUDE_DIR})
else () else ()
set(BOOST_INC_DIR "%{BoostIncDir}") # set by Qt Creator wizard set(BOOST_INCLUDE_DIR "%{BoostIncDir}") # set by Qt Creator wizard
endif () endif ()
if (EXISTS ${BOOST_INC_DIR}) if (BOOST_INCLUDE_DIR STREQUAL "")
include_directories(${BOOST_INC_DIR}) message("BOOST_INCLUDE_DIR is not set, assuming Boost can be found automatically in your system")
elseif (EXISTS ${BOOST_INCLUDE_DIR})
include_directories(${BOOST_INCLUDE_DIR})
endif () endif ()
@endif @endif