From a94d3734c2403d0e141cd0bb693e551578d5d5f3 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Fri, 9 Oct 2020 02:51:28 +1100 Subject: [PATCH] [all] pass the project path to the version.cmake script --- client/CMakeLists.txt | 2 +- host/CMakeLists.txt | 2 +- host/platform/Windows/installer.nsi | 2 +- obs/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index d84f192d..8391d5b8 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -59,7 +59,7 @@ get_filename_component(PROJECT_TOP "${PROJECT_SOURCE_DIR}/.." ABSOLUTE) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/version.c ${CMAKE_BINARY_DIR}/_version.c - COMMAND ${CMAKE_COMMAND} -P + COMMAND ${CMAKE_COMMAND} -D PROJECT_TOP=${PROJECT_TOP} -P ${PROJECT_TOP}/version.cmake ) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 061d1bf7..be1f04a2 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -33,7 +33,7 @@ get_filename_component(PROJECT_TOP "${PROJECT_SOURCE_DIR}/.." ABSOLUTE) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/version.c ${CMAKE_BINARY_DIR}/_version.c - COMMAND ${CMAKE_COMMAND} -P + COMMAND ${CMAKE_COMMAND} -D PROJECT_TOP=${PROJECT_TOP} -P ${PROJECT_TOP}/version.cmake ) diff --git a/host/platform/Windows/installer.nsi b/host/platform/Windows/installer.nsi index fe383faa..6fb4e0fe 100644 --- a/host/platform/Windows/installer.nsi +++ b/host/platform/Windows/installer.nsi @@ -134,7 +134,7 @@ Section "-Install" Section1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Looking Glass (host)" \ "NoModify" "1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Looking Glass (host)" \ - "DisplayVersion" ${VERSION} + "DisplayVersion" ${VERSION} SectionEnd diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt index 49baf2fc..550b6fc2 100644 --- a/obs/CMakeLists.txt +++ b/obs/CMakeLists.txt @@ -38,7 +38,7 @@ get_filename_component(PROJECT_TOP "${PROJECT_SOURCE_DIR}/.." ABSOLUTE) add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/version.c ${CMAKE_BINARY_DIR}/_version.c - COMMAND ${CMAKE_COMMAND} -P + COMMAND ${CMAKE_COMMAND} -D PROJECT_TOP=${PROJECT_TOP} -P ${PROJECT_TOP}/version.cmake )