diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-10-15 16:32:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 15:30:08 +0200 |
| commit | e29b35024e3adf3b58770573cb512395bc5fe176 (patch) | |
| tree | 4c291b1f4d7a0fefdde9df60617c0da1e719967d /mkspecs | |
| parent | 5f47ce0951214aad2eee46f6936b5ee513ed0fed (diff) | |
Don't test DLLDESTDIR when calculating dll location.
The DLLDESTDIR is not related to the install location and is not
populated for prefix_build configurations.
That resulted in the CMake files attempting to find the dlls in the lib/
directory instead of the bin/ directory.
Change-Id: Iec6a7c9b6dd656278b70ab128f3df9e8c45bbe4a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index d799e20c46..5abca8940b 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True } -!isEmpty(DLLDESTDIR):!static:!staticlib { +win32:!wince:!static:!staticlib { CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) contains(CMAKE_DLL_DIR, "^\\.\\./.*") { CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ |