summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-07-12 19:59:43 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-07-12 19:59:43 (GMT)
commit4b39302407a83e93a22dbabd784ec44e113d86bc (patch)
tree206520f87b4e5b82ff3157fab6eadee5962cbf38
parent52c080dc277228bf1a47249c11f0f48db191ccfe (diff)
parent374b9b9e74490a5734000b5e224c8d2c3d40630b (diff)
downloadCMake-4b39302407a83e93a22dbabd784ec44e113d86bc.zip
CMake-4b39302407a83e93a22dbabd784ec44e113d86bc.tar.gz
CMake-4b39302407a83e93a22dbabd784ec44e113d86bc.tar.bz2
Merge topic 'deploy-qt4-workaround-bug-13258'
374b9b9 DeployQt4: workaround bug 13258 where ARGV1 is leaked into a sub function.
-rw-r--r--Modules/DeployQt4.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index b37695d..edf4b4e 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -290,7 +290,7 @@ function(install_qt4_executable executable)
endforeach()
endif()
- resolve_qt4_paths(libs)
+ resolve_qt4_paths(libs "")
install(CODE
"INCLUDE(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\")