Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: msvc and release is a build failure #2

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: msvc and release is a build failure #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6768820
fix: msvc and release is a build failure
XMuli Jul 14, 2022
411f713
build: Generate .dll by default
XMuli Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(BUILD_SHARED_LIBS ON)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may it be wrapped by an if check?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What to calibrate?😰

If you want to generate .lib manually change it to OFF.


find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED)
Expand Down
22 changes: 11 additions & 11 deletions src/qtacrylichelper_global.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
#include <QtCore/qglobal.h>

#ifndef QTACRYLICHELPER_API
#ifdef QTACRYLICHELPER_STATIC
#define QTACRYLICHELPER_API
#else
#ifdef QTACRYLICHELPER_BUILD_LIBRARY
#define QTACRYLICHELPER_API Q_DECL_EXPORT
#else
#define QTACRYLICHELPER_API Q_DECL_IMPORT
#endif
#endif
#ifdef QTACRYLICHELPER_STATIC
#define QTACRYLICHELPER_API
#else
#ifdef QTACRYLICHELPER_BUILD_LIBRARY
#define QTACRYLICHELPER_API Q_DECL_EXPORT
#else
#define QTACRYLICHELPER_API Q_DECL_IMPORT
#endif
#endif
#endif

#if defined(Q_OS_WIN) && !defined(Q_OS_WINDOWS)
#define Q_OS_WINDOWS
#define Q_OS_WINDOWS
#endif

#ifndef Q_DISABLE_MOVE
Expand All @@ -55,7 +55,7 @@
#endif

#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0))
#define qAsConst(i) std::as_const(i)
#define qAsConst(i) std::as_const(i)
#endif

namespace _qam::Global {
Expand Down