From 42a7bc535e49af28dfa58807e8632833dcd5d01e Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 3 Feb 2015 18:31:29 +0000 Subject: [PATCH] Fix ProgramFiles path for 64-bit Windows installer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If we are building an 64bit installer on Windows we have to adjust the Program Files path otherwise it uses the wrong Program Files (x86) directory. Related CMake bug report http://public.kitware.com/Bug/view.php?id=14211 Patch by Ismail Dönmez! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@227999 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3177564b619..afcc9f0ce2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,9 @@ if(WIN32 AND NOT UNIX) "ExecWait '$INSTDIR/tools/msbuild/install.bat'") set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "ExecWait '$INSTDIR/tools/msbuild/uninstall.bat'") + if( CMAKE_CL_64 ) + set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") + endif() endif() include(CPack) -- 2.34.1