LADI
/
gmic-qt
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define and use _IS_UNIX_ instead of _IS_LINUX_ for non-MacOS Unixes

This commit is contained in:
Sébastien Fourey 2023-05-02 15:20:06 +02:00
parent 175176f17a
commit 99971e9b7f
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -299,14 +299,12 @@ add_definitions(-Dcimg_use_abort)
add_definitions(-Dcimg_appname=\"gmic\")
if (UNIX)
add_definitions(-D_IS_UNIX_)
if(ANDROID)
add_definitions(-Dcimg_display=0)
add_definitions(-D_IS_UNIX_)
elseif(NOT APPLE)
add_definitions(-Dcimg_display=1)
add_definitions(-D_IS_LINUX_)
add_definitions(-Dcimg_use_vt100)
add_definitions(-D_IS_UNIX_)
find_package(X11)
set(gmic_qt_LIBRARIES
${gmic_qt_LIBRARIES}

9
gmic_qt.pro
View File

@ -181,11 +181,13 @@ win32 {
}
unix:!macx {
DEFINES += _IS_LINUX_
DEFINES += _IS_UNIX_
PKGCONFIG += x11
message( Linux platform )
message( Unix platform )
}
macx { DEFINES += _IS_MACOS_ }
equals( HOST, "gimp")|equals( HOST, "gimp3") {
TARGET = gmic_gimp_qt
SOURCES += src/Host/Gimp/host_gimp.cpp
@ -507,6 +509,3 @@ UI_DIR = .ui
MOC_DIR = .moc
RCC_DIR = .qrc
OBJECTS_DIR = .obj
unix:!macx { DEFINES += _IS_UNIX_ }
macx { DEFINES += _IS_MACOS_ }

2
src/HeadlessProcessor.cpp
View File

@ -197,7 +197,7 @@ void HeadlessProcessor::sendProgressInformation()
float progress = _filterThread->progress();
int ms = _filterThread->duration();
unsigned long memory = 0;
#if defined(_IS_LINUX_)
#if defined(_IS_UNIX_)
QFile status("/proc/self/status");
if (status.open(QFile::ReadOnly)) {
QByteArray text = status.readAll();

4
src/Utils.cpp
View File

@ -41,7 +41,7 @@
#include <windows.h>
#include <tlhelp32.h>
#endif
#ifdef _IS_LINUX_
#ifdef _IS_UNIX_
#include <unistd.h>
#endif
@ -70,7 +70,7 @@ const QString & gmicConfigPath(bool create)
unsigned int host_app_pid()
{
#if defined(_IS_LINUX_)
#if defined(_IS_UNIX_)
return static_cast<int>(getppid());
#elif defined(_IS_WINDOWS_)
HANDLE h = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);

4
src/Widgets/ProgressInfoWidget.cpp
View File

@ -122,7 +122,7 @@ void ProgressInfoWidget::startFilterThreadAnimationAndShow()
ui->label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
ui->label->setAlignment(Qt::AlignRight);
#if defined(_IS_LINUX_) || defined(_IS_WINDOWS_)
#if defined(_IS_UNIX_) || defined(_IS_WINDOWS_)
QString largestText(tr("[Processing 88:00:00.888 | 888.9 GiB]"));
#else
QString largestText(tr("[Processing 88:00:00.888]"));
@ -198,7 +198,7 @@ void ProgressInfoWidget::updateThreadInformation()
}
}
QString durationStr = readableDuration(ms);
#ifdef _IS_LINUX_
#ifdef _IS_UNIX_
// Get memory usage
QString memoryStr("? KiB");
QFile status("/proc/self/status");