diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-12-04 10:42:08 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-12-04 10:33:47 +0000 |
| commit | 9c8451e9a76f1173d4c7fa4d538e2ed676743110 (patch) | |
| tree | 503a4f34c04d5626b1fac42be74446f777b08013 /cmake | |
| parent | c18482ffdee204b1345b75a00ce78db77b1e5498 (diff) | |
Fix that target was accessed before it was created
Amends c21932163779bcfe4577ac2e3326b8c113884829
Change-Id: I078df77ebfd7921c9c8bcaf131ae06a3a1fcd181
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QbsAPI.cmake | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/cmake/QbsAPI.cmake b/cmake/QbsAPI.cmake index 2c64a0303..5d5fada99 100644 --- a/cmake/QbsAPI.cmake +++ b/cmake/QbsAPI.cmake @@ -43,17 +43,19 @@ else() set(QBS_PLUGINS_RPATH "\$ORIGIN/${QBS_RELATIVE_PLUGINS_RPATH}") endif() -if(WIN32) - get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_RELEASE) - if(NOT _QTCORE_LIBRARY) - get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_DEBUG) +function(get_update_path_command var) + if(WIN32) + get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_RELEASE) + if(NOT _QTCORE_LIBRARY) + get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_DEBUG) + endif() + get_filename_component(_QT_LIBRARY_PATH "${_QTCORE_LIBRARY}" DIRECTORY) + get_target_property(_QBS_LIBRARY_PATH qbscore LIBRARY_OUTPUT_DIRECTORY) + set(${var} "set \"PATH=${_QT_LIBRARY_PATH}\;${_QBS_LIBRARY_PATH}\;%PATH%\"" PARENT_SCOPE) + else() + set(${var} "") endif() - get_filename_component(_QT_LIBRARY_PATH "${_QTCORE_LIBRARY}" DIRECTORY) - get_target_property(_QBS_LIBRARY_PATH qbscore LIBRARY_OUTPUT_DIRECTORY) - set(UPDATE_PATH_COMMAND set "PATH=${_QT_LIBRARY_PATH}\;${_QBS_LIBRARY_PATH}\;%PATH%") -else() - set(UPDATE_PATH_COMMAND "") -endif() +endfunction() if(WITH_UNIT_TESTS) set(QBS_UNIT_TESTS_DEFINES "QBS_ENABLE_UNIT_TESTS") |