rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use configure_files macro for WiX

This commit is contained in:
Andrew Nelless 2017-02-10 16:08:56 +00:00
parent db70d56d01
commit 09935aaf6c
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -364,6 +364,8 @@ endmacro (configure_files)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle ${CMAKE_BINARY_DIR}/bundle) configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle ${CMAKE_BINARY_DIR}/bundle)
elseif(WIN32 AND NOT UNIX)
configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
endif() endif()
if (CONF_DOXYGEN) if (CONF_DOXYGEN)
@ -375,17 +377,6 @@ if (CONF_DOXYGEN)
endif() endif()
if (WIN32)
configure_file (dist/wix/Include.wxi.in
"${CMAKE_BINARY_DIR}/dist/wix/Include.wxi" NEWLINE_STYLE WIN32)
configure_file (dist/wix/Product.wxs
"${CMAKE_BINARY_DIR}/dist/wix/Product.wxs" COPYONLY)
configure_file (dist/wix/Synergy.wixproj
"${CMAKE_BINARY_DIR}/dist/wix/Synergy.wixproj" COPYONLY)
endif()
option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON) option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
add_subdirectory(src) add_subdirectory(src)

8
dist/wix/Include.wxi.in vendored
View File

@ -4,9 +4,9 @@
<?define Version="1.9.0" ?> <!-- TODO: Configure this externally //--> <?define Version="1.9.0" ?> <!-- TODO: Configure this externally //-->
<?define QtVersion="5.8" ?> <!-- TODO: Configure this externally //--> <?define QtVersion="5.8" ?> <!-- TODO: Configure this externally //-->
<?define Author="Symless Ltd" ?> <?define Author="Symless Ltd" ?>
<?define BinPath="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(var.Configuration)" ?> <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
<?define ResPath="${CMAKE_CURRENT_SOURCE_DIR}/res" ?> <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
<?define ExtPath="${CMAKE_CURRENT_SOURCE_DIR}/ext" ?> <?define ExtPath="@CMAKE_CURRENT_SOURCE_DIR@/ext" ?>
<?if $(var.Platform) = "x64" ?> <?if $(var.Platform) = "x64" ?>
<?define ProgramFilesFolder="ProgramFiles64Folder" ?> <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
<?define PlatformSimpleName="64-bit" ?> <?define PlatformSimpleName="64-bit" ?>
@ -26,4 +26,4 @@
<?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?> <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
<?endif ?> <?endif ?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?> <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
</Include> </Include>