hyprland-share-picker: add missing sources to meson, format CMake

This commit is contained in:
Mihai Fufezan 2024-09-20 14:24:37 +00:00
parent 44106cd1ca
commit fd4a949458
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
2 changed files with 36 additions and 40 deletions

View file

@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
project(hyprland-share-picker VERSION 0.1 LANGUAGES CXX) project(
hyprland-share-picker
VERSION 0.1
LANGUAGES CXX)
set(QT_VERSION_MAJOR 6) set(QT_VERSION_MAJOR 6)
@ -14,52 +17,43 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets) find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets)
find_package(Qt6 REQUIRED COMPONENTS Widgets) find_package(Qt6 REQUIRED COMPONENTS Widgets)
set(PROJECT_SOURCES set(PROJECT_SOURCES main.cpp mainpicker.cpp mainpicker.h mainpicker.ui
main.cpp elidedbutton.h elidedbutton.cpp)
mainpicker.cpp
mainpicker.h
mainpicker.ui
elidedbutton.h
elidedbutton.cpp
)
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
qt_add_executable(hyprland-share-picker qt_add_executable(hyprland-share-picker MANUAL_FINALIZATION
MANUAL_FINALIZATION ${PROJECT_SOURCES})
${PROJECT_SOURCES} # Define target properties for Android with Qt 6 as: set_property(TARGET
) # hyprland-share-picker APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
# Define target properties for Android with Qt 6 as: # ${CMAKE_CURRENT_SOURCE_DIR}/android) For more information, see
# set_property(TARGET hyprland-share-picker APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR # https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
# ${CMAKE_CURRENT_SOURCE_DIR}/android)
# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
else() else()
if(ANDROID) if(ANDROID)
add_library(hyprland-share-picker SHARED add_library(hyprland-share-picker SHARED ${PROJECT_SOURCES})
${PROJECT_SOURCES} # Define properties for Android with Qt 5 after find_package() calls as:
) # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
# Define properties for Android with Qt 5 after find_package() calls as: else()
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") add_executable(hyprland-share-picker ${PROJECT_SOURCES})
else() endif()
add_executable(hyprland-share-picker
${PROJECT_SOURCES}
)
endif()
endif() endif()
target_link_libraries(hyprland-share-picker PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) target_link_libraries(hyprland-share-picker
PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
set_target_properties(hyprland-share-picker PROPERTIES set_target_properties(
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com hyprland-share-picker
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE TRUE MACOSX_BUNDLE_SHORT_VERSION_STRING
WIN32_EXECUTABLE TRUE ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
) MACOSX_BUNDLE TRUE
WIN32_EXECUTABLE TRUE)
install(TARGETS hyprland-share-picker install(
BUNDLE DESTINATION . TARGETS hyprland-share-picker
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) BUNDLE DESTINATION .
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if(QT_VERSION_MAJOR EQUAL 6) if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(hyprland-share-picker) qt_finalize_executable(hyprland-share-picker)
endif() endif()

View file

@ -10,6 +10,8 @@ sources = files([
'main.cpp', 'main.cpp',
'mainpicker.cpp', 'mainpicker.cpp',
'mainpicker.h', 'mainpicker.h',
'elidedbutton.h',
'elidedbutton.cpp',
]) ])
executable('hyprland-share-picker', executable('hyprland-share-picker',