diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -325,23 +325,31 @@ "Default URL where bug reports are to be submitted.") # Configure CPack. -set(CPACK_PACKAGE_INSTALL_DIRECTORY "LLVM") -set(CPACK_PACKAGE_VENDOR "LLVM") +if(NOT DEFINED CPACK_PACKAGE_INSTALL_DIRECTORY) + set(CPACK_PACKAGE_INSTALL_DIRECTORY "LLVM") +endif() +if(NOT DEFINED CPACK_PACKAGE_VENDOR) + set(CPACK_PACKAGE_VENDOR "LLVM") +endif() set(CPACK_PACKAGE_VERSION_MAJOR ${LLVM_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${LLVM_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${LLVM_VERSION_PATCH}) set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION}) set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.TXT") -set(CPACK_NSIS_COMPRESSOR "/SOLID lzma \r\n SetCompressorDictSize 32") if(WIN32 AND NOT UNIX) - set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "LLVM") + set(CPACK_NSIS_COMPRESSOR "/SOLID lzma \r\n SetCompressorDictSize 32") + if(NOT DEFINED CPACK_PACKAGE_INSTALL_REGISTRY_KEY) + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "LLVM") + endif() set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\cmake\\\\nsis_logo.bmp") set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\cmake\\\\nsis_icon.ico") set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\cmake\\\\nsis_icon.ico") set(CPACK_NSIS_MODIFY_PATH "ON") set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL "ON") if( CMAKE_CL_64 ) - set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") + if(NOT DEFINED CPACK_NSIS_INSTALL_ROOT) + set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") + endif() endif() endif() include(CPack)