Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

use backslashes for header image path on win

Browse source
This commit is contained in:
Stephen Birarda 2016-01-14 13:59:31 -08:00
parent d34c3bdc1c
commit 92c221620c
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmake/macros/FixPathForNSIS.cmake Normal file
View file

@ -0,0 +1,16 @@
#
# FixPathForNSIS.cmake
#
# Created by Sam Gateau on 1/14/16.
# Copyright 2016 High Fidelity, Inc.
#
# Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
#
macro(fix_path_for_nsis INITIAL_PATH RESULTING_PATH)
# replace forward slash with backslash
string(REPLACE "/" "\\\\" _BACKSLASHED_PATH ${INITIAL_PATH})
# set the resulting path variable
set(${RESULTING_PATH} ${_BACKSLASHED_PATH})
endmacro()

8
cmake/macros/GenerateInstallers.cmake
View file

@ -24,7 +24,13 @@ macro(GENERATE_INSTALLERS)
set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME})
set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
set(INSTALLER_HEADER_IMAGE "${HF_CMAKE_DIR}/installer/installer-header.bmp")
if (WIN32)
# use macro to put backslashes in header image path since nsis requires them
set(_INSTALLER_HEADER_BAD_PATH "${HF_CMAKE_DIR}/installer/installer-header.bmp")
set(INSTALLER_HEADER_IMAGE "")
fix_path_for_nsis(${_INSTALLER_HEADER_BAD_PATH} INSTALLER_HEADER_IMAGE)
endif()
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")