From 0831c34fc0af2f15b43f4b4cabba7db54ab129ee Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 28 Nov 2018 16:09:38 +0100 Subject: [PATCH] Fix #4730: Add git revision, architecture and minimum os support to file properties. --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ce2c0c4f..1ecad9444 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -490,12 +490,6 @@ if(WIN32) message(FATAL_ERROR "Unknown generator ${CMAKE_GENERATOR}") endif() - # Set product and vendor for dll and exe version information. - set(RC_VERSION_VENDOR ${VENDOR}) - set(RC_VERSION_PRODUCT ${PRODUCT}) - set(RC_VERSION_PATCH ${BUILD_NUMBER}) - set(RC_VERSION_DESCRIPTION ${GIT_REVISION}) - string(TIMESTAMP RC_VERSION_YEAR "%Y") if(NOT DEFINED CMAKE_WINDOWS_VERSION) @@ -512,6 +506,12 @@ if(WIN32) add_definitions(-DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00) endif() + # Set product and vendor for dll and exe version information. + set(RC_VERSION_VENDOR ${VENDOR}) + set(RC_VERSION_PRODUCT ${PRODUCT}) + set(RC_VERSION_PATCH ${BUILD_NUMBER}) + set(RC_VERSION_DESCRIPTION "${FREERDP_VERSION_FULL} ${GIT_REVISION} ${CMAKE_WINDOWS_VERSION} ${CMAKE_SYSTEM_PROCESSOR}") + if (FREERDP_EXTERNAL_SSL_PATH) set(OPENSSL_ROOT_DIR ${FREERDP_EXTERNAL_SSL_PATH}) endif()