Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00
Code Issues Projects Releases Activity

Remove install step

Browse Source
This commit is contained in:
Elias Steurer 2020-07-08 17:10:27 +02:00
parent db637a44b0
commit c76bebb68b
5 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/stomt-qml

@ -1 +1 @@
Subproject commit 31863079c3b7d1af8f7bdbb23c4e31fd2956e6ad Subproject commit 71b51ad9d295b560d20bfab18727eec5403dbdd3

13
Docs/DeveloperSetup.md
View File

@ -27,13 +27,8 @@ chmod +x install-dependencies.sh
* qt-breakpad * qt-breakpad
5. **Follow the steps below for your OS**. 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!** 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" .
<div> 7. Add CMake variables
<img width="100%" height="auto" src="../.gitlab/media/QtCreator_install.png">
</div>
8. Add CMake variables
* Add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET * Add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET
* Extras -> Tools -> Kits -> <Your Kit> -> CMake Configuration -> Append this: * Extras -> Tools -> Kits -> <Your Kit> -> CMake Configuration -> Append this:
* CMAKE_TOOLCHAIN_FILE:STRING=%{CurrentProject:Path}/Common/vcpkg/scripts/buildsystems/vcpkg.cmake * CMAKE_TOOLCHAIN_FILE:STRING=%{CurrentProject:Path}/Common/vcpkg/scripts/buildsystems/vcpkg.cmake
@ -44,12 +39,12 @@ chmod +x install-dependencies.sh
<img width="100%" height="auto" src="../.gitlab/media/QtCreator_kit.png"> <img width="100%" height="auto" src="../.gitlab/media/QtCreator_kit.png">
</div> </div>
9. Check if Ninja is selected 8. Check if Ninja is selected
* Extras -> Tools -> Kits -> <Your Kit> -> CMakeGenerator -> Change to: * Extras -> Tools -> Kits -> <Your Kit> -> CMakeGenerator -> Change to:
* Generator: Ninja * Generator: Ninja
* Extra Generator: CodeBlocks * Extra Generator: CodeBlocks
10. Save and close the settings. 9. 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. 10. Press build (the big green play button). This will compile the project and copy all necessary files into your Qt installation.
### Windows ### Windows
1. [Download and install MSVC 2019 Community](https://visualstudio.microsoft.com/vs/community/) 1. [Download and install MSVC 2019 Community](https://visualstudio.microsoft.com/vs/community/)

6
ScreenPlay/CMakeLists.txt
View File

@ -90,11 +90,7 @@ target_include_directories(${PROJECT_NAME}
${QT_TELEMTRY_INCLUDE} ${QT_TELEMTRY_INCLUDE}
${QT_BREAKPAD_INCLUDE}) ${QT_BREAKPAD_INCLUDE})
install(FILES configure_file(assets/fonts/NotoSansCJKkr-Regular.otf ${CMAKE_BINARY_DIR}/bin/assets/fonts/ COPYONLY)
assets/fonts/NotoSansCJKkr-Regular.otf
DESTINATION
${CMAKE_BINARY_DIR}/bin/assets/fonts/ )
execute_process(COMMAND git log --pretty=format:'%h' -n 1 execute_process(COMMAND git log --pretty=format:'%h' -n 1

7
ScreenPlaySysInfo/CMakeLists.txt
View File

@ -45,10 +45,9 @@ string(STRIP ${QT_INSTALL_QML_RAW} QT_INSTALL_QML)
set(DESTDIR "${QT_INSTALL_QML}/${TARGETPATH}") set(DESTDIR "${QT_INSTALL_QML}/${TARGETPATH}")
message("DESTDIR ${DESTDIR}") message("DESTDIR ${DESTDIR}")
install(FILES file(MAKE_DIRECTORY ${DESTDIR})
qmldir
DESTINATION configure_file(qmldir ${DESTDIR} COPYONLY)
${DESTDIR} )
# Copies ScreenPlaySysInfo.* into qt qml plugins folder # Copies ScreenPlaySysInfo.* into qt qml plugins folder

6
ScreenPlayWallpaper/CMakeLists.txt
View File

@ -67,7 +67,5 @@ target_link_libraries(${PROJECT_NAME}
) )
install(FILES configure_file(index.html ${CMAKE_BINARY_DIR}/bin/ COPYONLY)
index.html
DESTINATION
${CMAKE_BINARY_DIR}/bin )