diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
commit | 74e2520cd94200e326715a7733d2583a185bc6a7 (patch) | |
tree | a0d8f4957cf9d256a3cc3445c7db25384f97e249 /packaging | |
parent | 8b1571d80341770818404c9cc9ed4b362ffe5710 (diff) | |
parent | 33827e7dbfc177ef52718f63eaf87e005ab3e8b5 (diff) | |
download | mariadb-git-74e2520cd94200e326715a7733d2583a185bc6a7.tar.gz |
merge mysql-5.5->mysql-5.5-bugteam
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/WiX/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packaging/WiX/CMakeLists.txt b/packaging/WiX/CMakeLists.txt index 052887f10a1..4048273fc03 100644 --- a/packaging/WiX/CMakeLists.txt +++ b/packaging/WiX/CMakeLists.txt @@ -63,7 +63,12 @@ FIND_PROGRAM(LIGHT_EXECUTABLE light ${WIX_DIR}) IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf") SET(COPYING_RTF "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf") ELSE() - FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../COPYING" CONTENTS) + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql") + SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql") + ELSE() + SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../COPYING") + ENDIF() + FILE(READ ${LICENSE_FILE} CONTENTS) STRING(REGEX REPLACE "\n" "\\\\par\n" CONTENTS "${CONTENTS}") STRING(REGEX REPLACE "\t" "\\\\tab" CONTENTS "${CONTENTS}") FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15") |