1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 22:42:34 +02:00

Remove install step

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

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

View File

@ -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" .
<div>
<img width="100%" height="auto" src="../.gitlab/media/QtCreator_install.png">
</div>
8. Add CMake variables
7. Add CMake variables
* Add CMAKE_TOOLCHAIN_FILE and VCPKG_TARGET_TRIPLET
* Extras -> Tools -> Kits -> <Your Kit> -> 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
<img width="100%" height="auto" src="../.gitlab/media/QtCreator_kit.png">
</div>
9. Check if Ninja is selected
8. Check if Ninja is selected
* Extras -> Tools -> Kits -> <Your Kit> -> 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/)

View File

@ -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

View File

@ -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

View File

@ -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)