Skip to content

Commit

Permalink
Use QEFI as include and lib target
Browse files Browse the repository at this point in the history
  • Loading branch information
Inokinoki committed Jul 3, 2021
1 parent 9bc775d commit f05ef79
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
16 changes: 3 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)

find_package(PkgConfig)
if(PkgConfig_FOUND)
pkg_check_modules(EFIVAR efivar)
endif()
find_package(QEFI REQUIRED)

set(PROJECT_SOURCES
main.cpp
Expand All @@ -31,7 +28,6 @@ set(PROJECT_SOURCES
qefientry.h
qefientrystaticlist.cpp
qefientrystaticlist.h
qefi.cpp
)

if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
Expand All @@ -44,11 +40,5 @@ else()
)
endif()

# TODO: Make a CMAKE project config file in QEFI, the libefivar should be linked automatically
if(EFIVAR_FOUND)
message("Use libefivar for EFI operations")
include_directories(${EFIVAR_INCLUDE_DIRS})
target_link_libraries(QEFIEntryManager PRIVATE ${EFIVAR_LIBRARIES})
endif()

target_link_libraries(QEFIEntryManager PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
# Make a CMAKE project config file in QEFI, the libefivar should be linked automatically
target_link_libraries(QEFIEntryManager PRIVATE Qt${QT_VERSION_MAJOR}::Widgets QEFI)
3 changes: 1 addition & 2 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#include <QApplication>
#include <QMessageBox>
#include <qefientrystaticlist.h>

bool qefi_is_available();
#include <qefi.h>

int main(int argc, char *argv[])
{
Expand Down
5 changes: 1 addition & 4 deletions qefientrystaticlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@

#include <QDebug>

QByteArray qefi_get_variable(QUuid uuid, QString name);
quint16 qefi_get_variable_uint16(QUuid uuid, QString name);
void qefi_set_variable_uint16(QUuid uuid, QString name, quint16 value);
void qefi_set_variable(QUuid uuid, QString name, QByteArray value);
#include <qefi.h>

QEFIEntryStaticList::QEFIEntryStaticList()
{
Expand Down

0 comments on commit f05ef79

Please sign in to comment.