VKVM
/
Text-Renderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into 'master' 

Final Merge

See merge request link/projekte/ws19/vkvm-new/text-renderer!9
This commit is contained in:
Julian Hinxlage 2020-01-09 06:51:25 +00:00
parent 762f8af5fe c588c9652b
commit d4e8fcfe6c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -30,7 +30,7 @@ make_test:
- docker-ci - docker-ci
script: script:
- apt-get update - apt-get update
- apt-get install -y g++ make cmake clang-tidy - apt-get install -y clang make cmake clang-tidy
- mkdir current - mkdir current
- ls | grep -v current | xargs mv -t current - ls | grep -v current | xargs mv -t current
- git clone https://github.com/catchorg/Catch2.git - git clone https://github.com/catchorg/Catch2.git
@ -56,7 +56,7 @@ cmake_build:
- docker-ci - docker-ci
script: script:
- apt-get update - apt-get update
- apt-get install -y g++ make cmake clang-tidy - apt-get install -y clang make cmake clang-tidy
- mkdir current - mkdir current
- ls | grep -v current | xargs mv -t current - ls | grep -v current | xargs mv -t current
- git clone https://github.com/catchorg/Catch2.git - git clone https://github.com/catchorg/Catch2.git

3
CMakeLists.txt
View File

@ -8,6 +8,9 @@ if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
endif() endif()
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "bin" "doc" "CMakeFiles" "lib" "include") set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "bin" "doc" "CMakeFiles" "lib" "include")
set(CMAKE_C_COMPILER "clang")
set(CMAKE_CXX_COMPILER "clang++")
project(TextRenderer) project(TextRenderer)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)