diff --git a/Common/stomt-qml b/Common/stomt-qml index 31863079..71b51ad9 160000 --- a/Common/stomt-qml +++ b/Common/stomt-qml @@ -1 +1 @@ -Subproject commit 31863079c3b7d1af8f7bdbb23c4e31fd2956e6ad +Subproject commit 71b51ad9d295b560d20bfab18727eec5403dbdd3 diff --git a/Docs/DeveloperSetup.md b/Docs/DeveloperSetup.md index ed7b1e72..f5110748 100644 --- a/Docs/DeveloperSetup.md +++ b/Docs/DeveloperSetup.md @@ -27,13 +27,8 @@ chmod +x install-dependencies.sh * qt-breakpad 5. **Follow the steps below for your OS**. 6. Open the CMakeLists.txt via QtCreator. **This can take some time until QtCreator parses all files!** -7. Add a second build step at: Projects -> Build -> Add Build Step -> Select Build -> Select "install" . -
- -
- -8. Add CMake variables +7. Add CMake variables * Add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET * Extras -> Tools -> Kits -> -> CMake Configuration -> Append this: * CMAKE_TOOLCHAIN_FILE:STRING=%{CurrentProject:Path}/Common/vcpkg/scripts/buildsystems/vcpkg.cmake @@ -44,12 +39,12 @@ chmod +x install-dependencies.sh -9. Check if Ninja is selected +8. Check if Ninja is selected * Extras -> Tools -> Kits -> -> CMakeGenerator -> Change to: * Generator: Ninja * Extra Generator: CodeBlocks -10. Save and close the settings. -11. Press build (the big green play button). This will compile the project and copy all necessary files into your Qt installation. +9. Save and close the settings. +10. Press build (the big green play button). This will compile the project and copy all necessary files into your Qt installation. ### Windows 1. [Download and install MSVC 2019 Community](https://visualstudio.microsoft.com/vs/community/) diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index f905b7ba..3a004dcb 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -90,11 +90,7 @@ target_include_directories(${PROJECT_NAME} ${QT_TELEMTRY_INCLUDE} ${QT_BREAKPAD_INCLUDE}) -install(FILES - assets/fonts/NotoSansCJKkr-Regular.otf - DESTINATION - ${CMAKE_BINARY_DIR}/bin/assets/fonts/ ) - +configure_file(assets/fonts/NotoSansCJKkr-Regular.otf ${CMAKE_BINARY_DIR}/bin/assets/fonts/ COPYONLY) execute_process(COMMAND git log --pretty=format:'%h' -n 1 diff --git a/ScreenPlaySysInfo/CMakeLists.txt b/ScreenPlaySysInfo/CMakeLists.txt index a021f675..2222ff5e 100644 --- a/ScreenPlaySysInfo/CMakeLists.txt +++ b/ScreenPlaySysInfo/CMakeLists.txt @@ -45,10 +45,9 @@ string(STRIP ${QT_INSTALL_QML_RAW} QT_INSTALL_QML) set(DESTDIR "${QT_INSTALL_QML}/${TARGETPATH}") message("DESTDIR ${DESTDIR}") -install(FILES - qmldir - DESTINATION - ${DESTDIR} ) +file(MAKE_DIRECTORY ${DESTDIR}) + +configure_file(qmldir ${DESTDIR} COPYONLY) # Copies ScreenPlaySysInfo.* into qt qml plugins folder diff --git a/ScreenPlayWallpaper/CMakeLists.txt b/ScreenPlayWallpaper/CMakeLists.txt index 3ab05cc6..3e0b2494 100644 --- a/ScreenPlayWallpaper/CMakeLists.txt +++ b/ScreenPlayWallpaper/CMakeLists.txt @@ -67,7 +67,5 @@ target_link_libraries(${PROJECT_NAME} ) -install(FILES - index.html - DESTINATION - ${CMAKE_BINARY_DIR}/bin ) +configure_file(index.html ${CMAKE_BINARY_DIR}/bin/ COPYONLY) +