Integrate Qt6 UI engine and add NSIS installer #3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| cmake_minimum_required(VERSION 3.16) | ||
| project(DirectDesktopSuite) | ||
|
|
||
| # 1. New Qt6 Engine (Optional) | ||
| find_package(Qt6 COMPONENTS Core Gui Quick Widgets QUIET) | ||
| if(NOT Qt6_FOUND) | ||
| message(STATUS "Qt6 not found. DirectDesktop will build without Qt engine.") | ||
| endif() | ||
|
|
||
| # 2. Main DirectUI + Qt Application | ||
| add_subdirectory(DirectDesktop) | ||
|
|
||
| # 3. Consolidation (Install to 'bin' folder in build directory) | ||
| set(OUTPUT_DIR "bin") | ||
|
|
||
| install(TARGETS DirectDesktop RUNTIME DESTINATION "${OUTPUT_DIR}") | ||
| if(Qt6_FOUND) | ||
| # Deploy Qt libraries | ||
| get_target_property(_qmake_executable Qt6::qmake IMPORTED_LOCATION) | ||
| get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY) | ||
| find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}") | ||
|
|
||
| if(WINDEPLOYQT_EXECUTABLE) | ||
| install(CODE " | ||
| execute_process(COMMAND \"${WINDEPLOYQT_EXECUTABLE}\" | ||
| --release | ||
| --no-translations | ||
| --no-compiler-runtime | ||
| --no-opengl-sw | ||
| --no-system-d3d-compiler | ||
| \"\${CMAKE_INSTALL_PREFIX}/${OUTPUT_DIR}/DirectDesktop.exe\") | ||
| ") | ||
| endif() | ||
| endif() | ||
|
|
||
| # Copy UI files for DirectUI | ||
| install(DIRECTORY "${CMAKE_SOURCE_DIR}/DirectDesktop/ui" DESTINATION "${OUTPUT_DIR}/DirectDesktop") | ||
| install(DIRECTORY "${CMAKE_SOURCE_DIR}/DirectDesktop/ImageResources" DESTINATION "${OUTPUT_DIR}/DirectDesktop") | ||
|
|
||
| # Copy C# binaries if they exist | ||
| find_program(DOTNET_EXE dotnet) | ||
| if(DOTNET_EXE) | ||
| install(CODE " | ||
| file(GLOB_RECURSE CS_BINS \"${CMAKE_SOURCE_DIR}/DirectDesktopSettings/bin/Release/net11.0-windows/*\") | ||
| foreach(file \${CS_BINS}) | ||
| file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${OUTPUT_DIR}\" TYPE FILE FILES \"\${file}\") | ||
| endforeach() | ||
| ") | ||
| endif() | ||
|
|
||
| # 4. CPack Installer Configuration | ||
| set(CPACK_PACKAGE_NAME "DirectDesktop") | ||
| set(CPACK_PACKAGE_VENDOR "Rectify11") | ||
| set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "DirectDesktop Custom Desktop Shell") | ||
| set(CPACK_PACKAGE_VERSION "1.0.0") | ||
| set(CPACK_PACKAGE_INSTALL_DIRECTORY "DirectDesktop") | ||
| set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/.gitignore") # Placeholder if no LICENSE file | ||
|
|
||
| # NSIS Specifics | ||
| set(CPACK_GENERATOR "NSIS") | ||
| set(CPACK_NSIS_DISPLAY_NAME "DirectDesktop") | ||
| set(CPACK_NSIS_PACKAGE_NAME "DirectDesktop") | ||
| set(CPACK_NSIS_HELP_LINK "https://github.com/Rectify11/DirectDesktop") | ||
| set(CPACK_NSIS_URL_INFO_ABOUT "https://github.com/Rectify11/DirectDesktop") | ||
| set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/DirectDesktop/DirectDesktop.ico") | ||
| set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/DirectDesktop/DirectDesktop.ico") | ||
|
|
||
| # Shortcuts: Point to the Settings app so users know what it's doing | ||
| set(CPACK_NSIS_CREATE_ICONS_EXTRA " | ||
| CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\DirectDesktop Control Panel.lnk' '$INSTDIR\\\\bin\\\\DirectDesktopSettings.exe' | ||
| CreateShortCut '$DESKTOP\\\\DirectDesktop Control Panel.lnk' '$INSTDIR\\\\bin\\\\DirectDesktopSettings.exe' | ||
| ") | ||
| set(CPACK_NSIS_DELETE_ICONS_EXTRA " | ||
| Delete '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\DirectDesktop Control Panel.lnk' | ||
| Delete '$DESKTOP\\\\DirectDesktop Control Panel.lnk' | ||
| ") | ||
|
|
||
| # Registry entry for auto-start or identification | ||
| set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " | ||
| WriteRegStr HKLM 'Software\\\\DirectDesktop' 'InstallDir' '$INSTDIR' | ||
| ") | ||
|
|
||
| include(CPack) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| cmake_minimum_required(VERSION 3.16) | ||
| project(DirectDesktopWin32 LANGUAGES CXX) | ||
|
|
||
| set(CMAKE_CXX_STANDARD 17) | ||
|
|
||
| # MSVC specific flags to match .vcxproj | ||
| if(MSVC) | ||
| add_definitions(-DUNICODE -D_UNICODE -DDIRECTUI_STATIC -DDUSER_STATIC) | ||
| endif() | ||
|
|
||
| # Collect source files | ||
| file(GLOB SRC_FILES_ROOT "*.cpp") | ||
| file(GLOB SRC_FILES_BACKEND "backend/*.cpp") | ||
| file(GLOB SRC_FILES_COREUI "coreui/*.cpp") | ||
| file(GLOB SRC_FILES_UI "ui/*.cpp") | ||
|
|
||
| # Exclude QtEngine.cpp from the main list as it is built separately | ||
| list(REMOVE_ITEM SRC_FILES_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/QtEngine.cpp") | ||
|
|
||
| set(SRC_FILES | ||
| ${SRC_FILES_ROOT} | ||
| ${SRC_FILES_BACKEND} | ||
| ${SRC_FILES_COREUI} | ||
| ${SRC_FILES_UI} | ||
| "Include/dui70/DirectUI/DirectUI.cpp" | ||
| ) | ||
|
|
||
| # Main executable target | ||
| add_executable(DirectDesktop WIN32 | ||
| ${SRC_FILES} | ||
| DirectDesktop.rc | ||
| DirectDesktop.manifest | ||
| ) | ||
|
|
||
| # Apply compiler options to the main target | ||
| if(MSVC) | ||
| target_compile_options(DirectDesktop PRIVATE /Zc:wchar_t-) | ||
| target_compile_definitions(DirectDesktop PRIVATE _HAS_STD_BYTE=0) | ||
| endif() | ||
|
|
||
| # Include directories | ||
| target_include_directories(DirectDesktop PRIVATE | ||
| ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/backend | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/coreui | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/ui | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/Include | ||
| ) | ||
|
|
||
| # Link the provided and system libraries | ||
| target_link_libraries(DirectDesktop PRIVATE | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/dui70.lib | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/DUser.lib | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/Everything64.lib | ||
| user32 | ||
| shell32 | ||
| gdi32 | ||
| comctl32 | ||
| ole32 | ||
| shlwapi | ||
| dwmapi | ||
| uxtheme | ||
| windowscodecs | ||
| gdiplus | ||
| advapi32 | ||
| shcore | ||
| wtsapi32 | ||
| powrprof | ||
| oleaut32 | ||
| ) | ||
|
|
||
| # Embed Qt Engine if available | ||
| if(Qt6_FOUND) | ||
| add_library(DirectDesktopQtEngine STATIC QtEngine.cpp ui/qml.qrc) | ||
|
|
||
| # Qt requires _HAS_STD_BYTE=1 and doesn't use the /Zc:wchar_t- flag | ||
| target_compile_definitions(DirectDesktopQtEngine PRIVATE _HAS_STD_BYTE=1 ENABLE_QT DIRECTUI_STATIC DUSER_STATIC) | ||
| set_target_properties(DirectDesktopQtEngine PROPERTIES AUTOMOC ON AUTORCC ON AUTOUIC ON) | ||
|
|
||
| target_link_libraries(DirectDesktopQtEngine PRIVATE | ||
| Qt6::Core | ||
| Qt6::Gui | ||
| Qt6::Quick | ||
| Qt6::Widgets | ||
| ) | ||
|
|
||
| target_compile_definitions(DirectDesktop PRIVATE ENABLE_QT) | ||
| target_link_libraries(DirectDesktop PRIVATE DirectDesktopQtEngine) | ||
| endif() | ||
|
|
||
| # Build the C# Control Panel as a post-step | ||
| find_program(DOTNET_EXE dotnet) | ||
| if(DOTNET_EXE) | ||
| add_custom_command(TARGET DirectDesktop POST_BUILD | ||
| COMMAND ${DOTNET_EXE} build ${CMAKE_SOURCE_DIR}/DirectDesktopSettings/DirectDesktopSettings.csproj -c Release | ||
| COMMENT "Building C# Control Panel..." | ||
| ) | ||
| endif() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM might not work on ur sys if path or toolchain differ so pay a bit of an attention here might need to tweak if needed
**Quick note do not remove the ones about the qt6 as it need its libraries(dlls) to be bundled with to actually work