Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

openfpm_vcluster
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

a6657e80

Commit a6657e80 authored 3 years ago by Abhinav Singh

Downloads
- Plain Diff

Fixing merge conflicts

parents 7b985412 a8879b9e

No related merge requests found

Pipeline #4363 passed 3 years ago

Stage: build

Stage: test

Changes 12
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 0 deletions

.gitlab-ci.yml
CMakeLists.txt 32 additions, 34 deletions

CMakeLists.txt
build.sh 14 additions, 8 deletions

build.sh
configure 15 additions, 5 deletions

configure
discover_os 39 additions, 0 deletions

discover_os
install_BOOST.sh 24 additions, 6 deletions

install_BOOST.sh
install_CMAKE_on_CI.sh 15 additions, 0 deletions

install_CMAKE_on_CI.sh
src/CMakeLists.txt 38 additions, 48 deletions

src/CMakeLists.txt
src/VCluster/VCluster.cpp 1 addition, 12 deletions

src/VCluster/VCluster.cpp
src/VCluster/VCluster.hpp 6 additions, 30 deletions

src/VCluster/VCluster.hpp
src/VCluster/VCluster_meta_function.hpp 2 additions, 2 deletions

src/VCluster/VCluster_meta_function.hpp
src/config/config_cmake.h.in 15 additions, 0 deletions

src/config/config_cmake.h.in

with 203 additions and 145 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment