Browse Source

Merge branch 'dev' into 'master'

Final Merge

See merge request link/projekte/ws19/vkvm-new/text-renderer!9
master
Julian Hinxlage 1 year ago
parent
commit
d4e8fcfe6c
  1. 4
      .gitlab-ci.yml
  2. 3
      CMakeLists.txt

4
.gitlab-ci.yml

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

3
CMakeLists.txt

@ -8,6 +8,9 @@ if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
endif()
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)
set(CMAKE_CXX_STANDARD 14)

Loading…
Cancel
Save