Browse Source

Merge branch 'dev' into 'master'

Final Merge

See merge request link/projekte/ws19/vkvm-new/library!5
master
Julian Hinxlage 2 years ago
parent
commit
397982e59a
  1. 4
      .gitlab-ci.yml
  2. 3
      CMakeLists.txt
  3. 2
      src/vkvm.cpp

4
.gitlab-ci.yml

@ -22,7 +22,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
- git clone https://github.com/catchorg/Catch2.git
- cd Catch2
- cmake -Bbuild -H. -DBUILD_TESTING=OFF
@ -40,7 +40,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
- git clone https://github.com/catchorg/Catch2.git
- cd Catch2
- cmake -Bbuild -H. -DBUILD_TESTING=OFF

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(library)
set(CMAKE_CXX_STANDARD 14)

2
src/vkvm.cpp

@ -187,6 +187,8 @@ namespace vkvm {
}
auto reset() -> void {
impl.sharedMemory = nullptr;
impl.localSharedMemory.clear();
setDefaultValues();
}

Loading…
Cancel
Save