From 2b9d810002905b3e4da46b3e244205f0bc964bca Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Fri, 10 Feb 2023 14:10:46 +0800 Subject: [PATCH] cmake: minor tweaks Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- cmake | 2 +- src/core/CMakeLists.txt | 17 +++++++--- src/core/framelesshelper.rc.in | 62 ---------------------------------- src/quick/CMakeLists.txt | 17 +++++++--- src/widgets/CMakeLists.txt | 17 +++++++--- 5 files changed, 37 insertions(+), 78 deletions(-) delete mode 100644 src/core/framelesshelper.rc.in diff --git a/cmake b/cmake index a79645b..6d0e4fb 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit a79645b0cded59bd69a412c5a7a199ce41a8ea69 +Subproject commit 6d0e4fb457aac7611f1ae96faf5130141c05a3bb diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index cb46041..dd0a13a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -136,12 +136,19 @@ elseif(UNIX) endif() if(WIN32 AND NOT FRAMELESSHELPER_BUILD_STATIC) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/framelesshelper.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/framelesshelpercore.rc @ONLY) - list(APPEND SOURCES - ${CMAKE_CURRENT_BINARY_DIR}/framelesshelpercore.rc + set(__rc_path "${CMAKE_CURRENT_BINARY_DIR}/framelesshelpercore.rc") + generate_win32_rc_file( + PATH "${__rc_path}" + VERSION "${PROJECT_VERSION}" + COMPANY "wangwenx190" + DESCRIPTION "${PROJECT_NAME} ${SUB_MOD_NAME} Module" + COPYRIGHT "MIT License" + ORIGINAL_FILENAME "${PROJECT_NAME}${SUB_MOD_NAME}.dll" + PRODUCT "${PROJECT_NAME}" + COMMENTS "Built from commit ${PROJECT_VERSION_COMMIT} on ${PROJECT_COMPILE_DATETIME} (UTC)." + LIBRARY ) + list(APPEND SOURCES "${__rc_path}") endif() set(ALL_SOURCES ${PUBLIC_HEADERS} ${PRIVATE_HEADERS} ${SOURCES}) diff --git a/src/core/framelesshelper.rc.in b/src/core/framelesshelper.rc.in deleted file mode 100644 index 724c914..0000000 --- a/src/core/framelesshelper.rc.in +++ /dev/null @@ -1,62 +0,0 @@ -/* - * MIT License - * - * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include - -VS_VERSION_INFO VERSIONINFO -FILEVERSION 0,0,0,0 -PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_TWEAK@ -FILEFLAGSMASK 0x3fL -#ifdef _DEBUG -FILEFLAGS VS_FF_DEBUG -#else -FILEFLAGS 0x0L -#endif -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "wangwenx190\0" - VALUE "FileDescription", "@PROJECT_NAME@ @SUB_MOD_NAME@ Module\0" - VALUE "FileVersion", "0.0.0.0\0" - VALUE "LegalCopyright", "MIT License\0" - #ifdef _DEBUG - VALUE "OriginalFilename", "@PROJECT_NAME@@SUB_MOD_NAME@d.dll\0" - #else - VALUE "OriginalFilename", "@PROJECT_NAME@@SUB_MOD_NAME@.dll\0" - #endif - VALUE "ProductName", "@PROJECT_NAME@\0" - VALUE "ProductVersion", "@PROJECT_VERSION@\0" - VALUE "Comments", "Built from commit @PROJECT_VERSION_COMMIT@ on @PROJECT_COMPILE_DATETIME@ (UTC).\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 9629d38..978f23a 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -82,12 +82,19 @@ set(SOURCES ) if(WIN32 AND NOT FRAMELESSHELPER_BUILD_STATIC) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/../core/framelesshelper.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperquick.rc @ONLY) - list(APPEND SOURCES - ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperquick.rc + set(__rc_path "${CMAKE_CURRENT_BINARY_DIR}/framelesshelperquick.rc") + generate_win32_rc_file( + PATH "${__rc_path}" + VERSION "${PROJECT_VERSION}" + COMPANY "wangwenx190" + DESCRIPTION "${PROJECT_NAME} ${SUB_MOD_NAME} Module" + COPYRIGHT "MIT License" + ORIGINAL_FILENAME "${PROJECT_NAME}${SUB_MOD_NAME}.dll" + PRODUCT "${PROJECT_NAME}" + COMMENTS "Built from commit ${PROJECT_VERSION_COMMIT} on ${PROJECT_COMPILE_DATETIME} (UTC)." + LIBRARY ) + list(APPEND SOURCES "${__rc_path}") endif() set(ALL_SOURCES ${PUBLIC_HEADERS} ${PRIVATE_HEADERS} ${SOURCES}) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 9b95b73..0886769 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -70,12 +70,19 @@ set(SOURCES ) if(WIN32 AND NOT FRAMELESSHELPER_BUILD_STATIC) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/../core/framelesshelper.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperwidgets.rc @ONLY) - list(APPEND SOURCES - ${CMAKE_CURRENT_BINARY_DIR}/framelesshelperwidgets.rc + set(__rc_path "${CMAKE_CURRENT_BINARY_DIR}/framelesshelperwidgets.rc") + generate_win32_rc_file( + PATH "${__rc_path}" + VERSION "${PROJECT_VERSION}" + COMPANY "wangwenx190" + DESCRIPTION "${PROJECT_NAME} ${SUB_MOD_NAME} Module" + COPYRIGHT "MIT License" + ORIGINAL_FILENAME "${PROJECT_NAME}${SUB_MOD_NAME}.dll" + PRODUCT "${PROJECT_NAME}" + COMMENTS "Built from commit ${PROJECT_VERSION_COMMIT} on ${PROJECT_COMPILE_DATETIME} (UTC)." + LIBRARY ) + list(APPEND SOURCES "${__rc_path}") endif() set(ALL_SOURCES ${PUBLIC_HEADERS} ${PRIVATE_HEADERS} ${SOURCES})