diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-16 16:06:57 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-16 16:06:57 +0100 |
| commit | f68e8aa8602026922bad641f17a901bf5908d069 (patch) | |
| tree | 7c36e5a5a382639f885c367f980bd3ff5ca59854 /packaging/WiX/CMakeLists.txt | |
| parent | 900317e6bd1fa3935a537275efa8059c5e883122 (diff) | |
| download | mariadb-git-f68e8aa8602026922bad641f17a901bf5908d069.tar.gz | |
Fix a couple fo things replated to MSI
Diffstat (limited to 'packaging/WiX/CMakeLists.txt')
| -rw-r--r-- | packaging/WiX/CMakeLists.txt | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/packaging/WiX/CMakeLists.txt b/packaging/WiX/CMakeLists.txt index 81852697fb8..f083c79e1df 100644 --- a/packaging/WiX/CMakeLists.txt +++ b/packaging/WiX/CMakeLists.txt @@ -4,10 +4,10 @@ IF(NOT WIN32) ENDIF()
FIND_PATH(WIX_DIR heat.exe
- $ENV{WIX_DIR}/bin
- $ENV{ProgramFiles}/wix/bin
- "$ENV{ProgramFiles}/Windows Installer XML v3/bin"
- "$ENV{ProgramFiles}/Windows Installer XML v3.5/bin"
+ $ENV{WIX_DIR}/bin
+ $ENV{ProgramFiles}/wix/bin
+ "$ENV{ProgramFiles}/Windows Installer XML v3/bin"
+ "$ENV{ProgramFiles}/Windows Installer XML v3.5/bin"
)
IF(NOT WIX_DIR)
@@ -31,6 +31,12 @@ ENDIF() ADD_CUSTOM_TARGET(
MSI
COMMAND set VS_UNICODE_OUTPUT=
- COMMAND ${CMAKE_COMMAND} ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
+ COMMAND ${CMAKE_COMMAND} -DCPACK_WIX_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
+)
+
+ADD_CUSTOM_TARGET(
+ MSI_ESSENTIALS
+ COMMAND set VS_UNICODE_OUTPUT=
+ COMMAND ${CMAKE_COMMAND} -DESSENTIALS=1 -DCPACK_WIX_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/CPackWixConfig.cmake ${CONFIG_PARAM} -P ${CMAKE_CURRENT_BINARY_DIR}/create_msi.cmake
)
|