From bebac12174a1d29cfd1c9052179508ad55abd33a Mon Sep 17 00:00:00 2001 From: Epicalert Date: Tue, 20 Jul 2021 23:42:51 +0800 Subject: [PATCH] Configure Windows Installer script with CMake Version code no longer needs to be updated in the wxs script; it will be handled by CMake. --- .gitignore | 1 + CMakeLists.txt | 1 + packaging/{facecam2d.wxs => facecam2d.wxs.in} | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) rename packaging/{facecam2d.wxs => facecam2d.wxs.in} (87%) diff --git a/.gitignore b/.gitignore index 4474fd2..93e2b3d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ fc2d build/ src/config.hpp +packaging/facecam2d.wxs diff --git a/CMakeLists.txt b/CMakeLists.txt index 236cc70..71c1427 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,7 @@ include_directories( ${GLUT_INCLUDE_DIR} ) include_directories( ${LIBZIP_INCLUDE_DIR} ) include_directories( ${PROJECT_SOURCE_DIR}/src ) configure_file( ${PROJECT_SOURCE_DIR}/src/config.hpp.in ${PROJECT_SOURCE_DIR}/src/config.hpp @ONLY ) +configure_file( ${PROJECT_SOURCE_DIR}/packaging/facecam2d.wxs.in ${PROJECT_SOURCE_DIR}/packaging/facecam2d.wxs @ONLY ) file( COPY ${PROJECT_SOURCE_DIR}/cvdata diff --git a/packaging/facecam2d.wxs b/packaging/facecam2d.wxs.in similarity index 87% rename from packaging/facecam2d.wxs rename to packaging/facecam2d.wxs.in index e136f9c..dcc7971 100644 --- a/packaging/facecam2d.wxs +++ b/packaging/facecam2d.wxs.in @@ -1,11 +1,11 @@ - - +