github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix qmake build and version

This commit is contained in:
Zhao Yuhang 2023-09-14 19:27:07 +08:00
parent 322c448bc1
commit 26b9996ec6
7 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
CMakeLists.txt
View File

@ -97,28 +97,28 @@ if(FRAMELESSHELPER_ENABLE_VCLTL AND NOT MSVC)
endif() endif()
set(FRAMELESSHELPER_LICENSE_HEADER "/* set(FRAMELESSHELPER_LICENSE_HEADER "/*
* MIT License * MIT License
* *
* Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao) * Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao)
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the \"Software\"), to deal * of this software and associated documentation files (the \"Software\"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is * copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/") */")
set(__extra_flags "") set(__extra_flags "")
if(NOT FRAMELESSHELPER_BUILD_STATIC) if(NOT FRAMELESSHELPER_BUILD_STATIC)

4
include/FramelessHelper/Core/framelesshelpercore_global.h
View File

@ -265,6 +265,10 @@ FRAMELESSHELPER_BEGIN_NAMESPACE
#include "framelesshelper.version" #include "framelesshelper.version"
#ifndef __FRAMELESSHELPER__
# define __FRAMELESSHELPER__ __FRAMELESSHELPER_VERSION__
#endif // __FRAMELESSHELPER__
namespace Global namespace Global
{ {

3
qmake/core.pri
View File

@ -7,9 +7,6 @@ CORE_PRIV_INC_DIR = $$CORE_PUB_INC_DIR/private
CORE_EXTRA_INC_DIR = $$PWD/inc/core CORE_EXTRA_INC_DIR = $$PWD/inc/core
CORE_SRC_DIR = $$PWD/../src/core CORE_SRC_DIR = $$PWD/../src/core
DEFINES += \
FRAMELESSHELPER_CORE_STATIC
INCLUDEPATH += \ INCLUDEPATH += \
$$BASE_INC_DIR \ $$BASE_INC_DIR \
$$COMMON_INC_DIR \ $$COMMON_INC_DIR \

14
qmake/inc/core/framelesshelper.config
View File

@ -22,16 +22,14 @@
* SOFTWARE. * SOFTWARE.
*/ */
// Generated automatically by CMake. // Caution: This file is generated by CMake automatically during configure.
// WARNING! DO NOT EDIT THIS FILE MANUALLY! // WARNING!!! DO NOT EDIT THIS FILE MANUALLY!!!
// ALL CHANGES WILL BE LOST AFTER RE-CONFIGURING! // ALL YOUR MODIFICATIONS HERE WILL GET LOST AFTER RE-CONFIGURING!!!
// Also please do not include this file directly,
// it's designed to be included by FramelessHelper's own headers.
#pragma once #pragma once
#ifndef _FRAMELESSHELPER_CONFIG_DEFINED_ #ifndef _FRAMELESSHELPER_CONFIG_INCLUDE_GUARD_
#define _FRAMELESSHELPER_CONFIG_DEFINED_ #define _FRAMELESSHELPER_CONFIG_INCLUDE_GUARD_
#define FRAMELESSHELPER_FEATURE_static_build 1 #define FRAMELESSHELPER_FEATURE_static_build 1
#define FRAMELESSHELPER_FEATURE_widgets 1 #define FRAMELESSHELPER_FEATURE_widgets 1
@ -46,4 +44,4 @@
#define FRAMELESSHELPER_FEATURE_border_painter 1 #define FRAMELESSHELPER_FEATURE_border_painter 1
#define FRAMELESSHELPER_FEATURE_system_button 1 #define FRAMELESSHELPER_FEATURE_system_button 1
#endif // _FRAMELESSHELPER_CONFIG_DEFINED_ #endif // _FRAMELESSHELPER_CONFIG_INCLUDE_GUARD_

44
qmake/inc/core/framelesshelper.version
View File

@ -22,30 +22,38 @@
* SOFTWARE. * SOFTWARE.
*/ */
// Generated automatically by QMake. // Caution: This file is generated by CMake automatically during configure.
// WARNING! DO NOT EDIT THIS FILE MANUALLY! // WARNING!!! DO NOT EDIT THIS FILE MANUALLY!!!
// ALL CHANGES WILL BE LOST AFTER RE-CONFIGURING! // ALL YOUR MODIFICATIONS HERE WILL GET LOST AFTER RE-CONFIGURING!!!
// Also please do not include this file directly,
// it's designed to be included by FramelessHelper's own headers.
#pragma once #pragma once
#ifndef _FRAMELESSHELPER_VERSION_DEFINED_ #ifndef _FRAMELESSHELPER_VERSION_INCLUDE_GUARD_
#define _FRAMELESSHELPER_VERSION_DEFINED_ #define _FRAMELESSHELPER_VERSION_INCLUDE_GUARD_
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MAJOR = 2;
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_MINOR = 5;
[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_PATCH = 0;
//[[maybe_unused]] inline constexpr const int FRAMELESSHELPER_VERSION_TWEAK = 0;
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_VERSION_STR[] = "2.5.0";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILE_DATETIME_STR[] = "UNKNOWN";
#define __FRAMELESSHELPER_VERSION_MAJOR__ 2 #define __FRAMELESSHELPER_VERSION_MAJOR__ 2
#define __FRAMELESSHELPER_VERSION_MINOR__ 5 #define __FRAMELESSHELPER_VERSION_MINOR__ 5
#define __FRAMELESSHELPER_VERSION_PATCH__ 0 #define __FRAMELESSHELPER_VERSION_PATCH__ 0
//#define __FRAMELESSHELPER_VERSION_TWEAK__ 0 #define __FRAMELESSHELPER_VERSION_TWEAK__ 0
#define __FRAMELESSHELPER_VERSION__ 0x02050000 #define __FRAMELESSHELPER_VERSION__ 0x02050000
#define __FRAMELESSHELPER__ 0x02050000
#endif // _FRAMELESSHELPER_VERSION_DEFINED_ [[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_MAJOR = 2;
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_MINOR = 5;
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_PATCH = 0;
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION_TWEAK = 0;
[[maybe_unused]] inline constexpr const unsigned long FRAMELESSHELPER_VERSION = 0x02050000;
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_VERSION_STR[] = "2.5.0";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_HASH_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_SUBJECT_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_AUTHOR_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_DATETIME_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMMIT_BRANCH_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILER_NAME_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILER_VERSION_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_COMPILER_VENDOR_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_BUILD_DATETIME_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_ARCHITECTURE_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_CMAKE_VERSION_STR[] = "UNKNOWN";
[[maybe_unused]] inline constexpr const char FRAMELESSHELPER_CMAKE_GENERATOR_STR[] = "UNKNOWN";
#endif // _FRAMELESSHELPER_VERSION_INCLUDE_GUARD_

3
qmake/quick.pri
View File

@ -9,9 +9,6 @@ QUICK_PUB_INC_DIR = $$COMMON_INC_DIR/Quick
QUICK_PRIV_INC_DIR = $$QUICK_PUB_INC_DIR/private QUICK_PRIV_INC_DIR = $$QUICK_PUB_INC_DIR/private
QUICK_SRC_DIR = $$PWD/../src/quick QUICK_SRC_DIR = $$PWD/../src/quick
DEFINES += \
FRAMELESSHELPER_QUICK_STATIC
INCLUDEPATH += \ INCLUDEPATH += \
$$BASE_INC_DIR \ $$BASE_INC_DIR \
$$COMMON_INC_DIR \ $$COMMON_INC_DIR \

3
qmake/widgets.pri
View File

@ -6,9 +6,6 @@ WIDGETS_PUB_INC_DIR = $$COMMON_INC_DIR/Widgets
WIDGETS_PRIV_INC_DIR = $$WIDGETS_PUB_INC_DIR/private WIDGETS_PRIV_INC_DIR = $$WIDGETS_PUB_INC_DIR/private
WIDGETS_SRC_DIR = $$PWD/../src/widgets WIDGETS_SRC_DIR = $$PWD/../src/widgets
DEFINES += \
FRAMELESSHELPER_WIDGETS_STATIC
INCLUDEPATH += \ INCLUDEPATH += \
$$BASE_INC_DIR \ $$BASE_INC_DIR \
$$COMMON_INC_DIR \ $$COMMON_INC_DIR \