blue
/
magpie
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

renamed project

This commit is contained in:
Blue 2023-12-03 11:39:48 -03:00
parent f547170728
commit da9513e4d9
Signed by: blue
GPG Key ID: 9B203B252A63EE38
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API/CMakeLists.txt
View File

@ -6,4 +6,4 @@ set(SOURCES
api.cpp api.cpp
) )
target_sources(megpie PRIVATE ${SOURCES}) target_sources(magpie PRIVATE ${SOURCES})

22
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.21.1) cmake_minimum_required(VERSION 3.21.1)
project(megpie project(magpie
VERSION 1.0 VERSION 1.0
LANGUAGES CXX LANGUAGES CXX
) )
@ -20,7 +20,7 @@ if(NOT EMSCRIPTEN AND CMAKE_TOOLCHAIN_FILE MATCHES ".*Emscripten\.cmake$")
set(EMSCRIPTEN TRUE) set(EMSCRIPTEN TRUE)
endif() endif()
qt_add_executable(megpie qt_add_executable(magpie
root.cpp root.cpp
) )
@ -33,30 +33,30 @@ if (EMSCRIPTEN)
if (CMAKE_BUILD_TYPE STREQUAL Debug) if (CMAKE_BUILD_TYPE STREQUAL Debug)
set(CMAKE_CXX_FLAGS "-gsource-map") set(CMAKE_CXX_FLAGS "-gsource-map")
else() else()
target_compile_options(megpie PRIVATE -Oz -g0) target_compile_options(magpie PRIVATE -Oz -g0)
target_link_options(megpie PRIVATE -0z -g0 --closure 1) target_link_options(magpie PRIVATE -0z -g0 --closure 1)
endif() endif()
message("building for emscripten") message("building for emscripten")
target_sources(megpie PRIVATE main_web.cpp) target_sources(magpie PRIVATE main_web.cpp)
else() else()
if (CMAKE_BUILD_TYPE STREQUAL Debug) if (CMAKE_BUILD_TYPE STREQUAL Debug)
else() else()
target_compile_options(megpie PRIVATE -O3) target_compile_options(magpie PRIVATE -O3)
endif() endif()
message("building for desktop") message("building for desktop")
target_sources(megpie PRIVATE main.cpp) target_sources(magpie PRIVATE main.cpp)
endif() endif()
if (CMAKE_BUILD_TYPE STREQUAL Debug) if (CMAKE_BUILD_TYPE STREQUAL Debug)
else() else()
target_compile_options(megpie PRIVATE -flto) target_compile_options(magpie PRIVATE -flto)
target_link_options(megpie PRIVATE -flto) target_link_options(magpie PRIVATE -flto)
endif() endif()
add_subdirectory(qml) add_subdirectory(qml)
add_subdirectory(API) add_subdirectory(API)
target_link_libraries(megpie PRIVATE target_link_libraries(magpie PRIVATE
Qt6::Core Qt6::Core
Qt6::Gui Qt6::Gui
Qt6::Qml Qt6::Qml
@ -66,7 +66,7 @@ target_link_libraries(megpie PRIVATE
) )
include(GNUInstallDirs) include(GNUInstallDirs)
install(TARGETS megpie install(TARGETS magpie
BUNDLE DESTINATION . BUNDLE DESTINATION .
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

4
qml/CMakeLists.txt
View File

@ -1,4 +1,4 @@
qt_add_qml_module(megpieQml qt_add_qml_module(magpieQml
URI "qml" URI "qml"
VERSION 1.0 VERSION 1.0
STATIC STATIC
@ -10,4 +10,4 @@ qt_add_qml_module(megpieQml
Welcome.qml Welcome.qml
) )
target_link_libraries(megpie PRIVATE megpieQml) target_link_libraries(magpie PRIVATE magpieQml)

8
qml/ServerPick.qml
View File

@ -4,7 +4,7 @@ import QtQuick.Layouts
Page { Page {
property string address property string address
property bool valid property bool valid: false
signal back() signal back()
signal success(address: string) signal success(address: string)
@ -111,7 +111,11 @@ Page {
} }
function check () { function check () {
valid = false; if (valid) {
success(address);
return;
}
modal.inProgress = true; modal.inProgress = true;
status.text = qsTr("Checking") + " " + address + "..."; status.text = qsTr("Checking") + " " + address + "...";
modal.open() modal.open()