Skip to content

Commit

Permalink
configurejson2cmake: Add special case handling for Windows BT config …
Browse files Browse the repository at this point in the history
…tests

Change-Id: Id73c44f5b7faff7392e7a8245e5e26e7dfe78cd8
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Qt CMake Build Bot
  • Loading branch information
owolff committed Sep 20, 2019
1 parent bb8f838 commit be3287d
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions util/cmake/configurejson2cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,11 @@ def parseTest(ctx, test, data, cm_fh):
cm_fh.write("if (LINUX)\n")
cm_fh.write(" set(" + librariesCmakeName + " pthread rt)\n")
cm_fh.write("endif()\n")
elif details["qmake"] == "!winrt: LIBS += runtimeobject.lib":
librariesCmakeName = format(featureName(test)) + "_TEST_LIBRARIES"
cm_fh.write("if (NOT WINRT)\n")
cm_fh.write(" set(" + librariesCmakeName + " runtimeobject)\n")
cm_fh.write("endif()\n")
elif details["qmake"] == "CONFIG += c++11":
# do nothing we're always in c++11 mode
pass
Expand Down

0 comments on commit be3287d

Please sign in to comment.