Commit 6b274340 authored by Florian Oetke's avatar Florian Oetke
Browse files

replaced moodycamel-concurrentqueue with submodule

parent 346ea939
......@@ -11,46 +11,46 @@ build_gcc:
script:
- export CC=gcc
- export CXX=g++
- mkdir /build
- cd /build
- mkdir build
- cd build
- mkdir bin
- rm -rf /build/src
- rm -rf src
- cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=../bin -DCMAKE_BUILD_TYPE=Release -DMIRRAGE_EXPORT_EXECUTABLE=ON ..
- cmake --build . --target src/install
- wget -nc -O/build/model_data.tar.xz https://github.com/lowkey42/mirrage/releases/download/v0.2/model_data.tar.xz
- wget -nc -Omodel_data.tar.xz https://github.com/lowkey42/mirrage/releases/download/v0.2/model_data.tar.xz
- cd bin/bin
- tar xf /build/model_data.tar.xz
- tar xf ../../model_data.tar.xz
artifacts:
paths:
- /build/bin
- build/bin
expire_in: 1 day
cache:
key: "${CI_PIPELINE_ID}-${CI_COMMIT_REF_SLUG}"
paths:
- /build
- build
build_clang:
stage: build
script:
- export CC=clang
- export CXX=clang++
- mkdir /build
- cd /build
- mkdir build
- cd build
- mkdir bin
- rm -rf /build/src
- rm -rf src
- cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=../bin -DCMAKE_BUILD_TYPE=Release -DMIRRAGE_EXPORT_EXECUTABLE=ON ..
- cmake --build . --target src/install
- wget -nc -O /build/model_data.tar.xz https://github.com/lowkey42/mirrage/releases/download/v0.2/model_data.tar.xz
- wget -nc -Omodel_data.tar.xz https://github.com/lowkey42/mirrage/releases/download/v0.2/model_data.tar.xz
- cd bin/bin
- tar xf /build/model_data.tar.xz
- tar xf ../../model_data.tar.xz
artifacts:
paths:
- /build/bin
- build/bin
expire_in: 1 week
cache:
key: "${CI_PIPELINE_ID}-${CI_COMMIT_REF_SLUG}"
paths:
- /build
- build
build_scanbuild:
stage: build
......
......@@ -31,3 +31,6 @@
[submodule "dependencies/sf2"]
path = dependencies/sf2
url = https://github.com/lowkey42/sf2.git
[submodule "dependencies/moodycamel"]
path = dependencies/moodycamel
url = https://github.com/cameron314/concurrentqueue.git
......@@ -14,7 +14,6 @@ env:
- CACHE_FILE_DI=$CACHE_DIR/docker_image.tar.gz
matrix:
- ANALYZE=false
- ANALYZE=true
matrix:
exclude:
......
......@@ -6,7 +6,7 @@ add_subdirectory(backward-cpp)
add_subdirectory(enet)
include(glm_interface.cmake)
include(gsl_interface.cmake)
add_subdirectory(moodycamel)
include(moodycamel_interface.cmake)
include(nuklear_interface.cmake)
include(magic_get_interface.cmake)
......
Subproject commit 8f7e861dd9411a0bf77a6b9de83a47b3424fafba
......@@ -3,18 +3,20 @@ cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
project(moodycamel LANGUAGES CXX)
add_library(moodycamel INTERFACE)
add_library(moodycamel::moodycamel ALIAS moodycamel)
target_include_directories(moodycamel SYSTEM INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/moodycamel>
$<INSTALL_INTERFACE:include>)
install(TARGETS moodycamel EXPORT moodycamel_targets INCLUDES DESTINATION include)
install(TARGETS moodycamel EXPORT moodycamelTargets INCLUDES DESTINATION include)
export(
EXPORT moodycamelTargets
FILE "${CMAKE_CURRENT_BINARY_DIR}/moodycamelTargets.cmake"
)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/include/
DESTINATION include
FILES_MATCHING PATTERN "*.h*")
install(EXPORT moodycamel_targets
FILE moodycamel.cmake
NAMESPACE moodycamel::
EXPORT moodycamelTargets FILE moodycamelTargets.cmake
DESTINATION lib/cmake
)
#pragma once
#include <moodycamel/concurrentqueue.hpp>
#include <concurrentqueue.h>
#ifndef ECS_COMPONENT_INCLUDED
#include "component.hpp"
......
......@@ -17,7 +17,7 @@
#include <mirrage/utils/string_utils.hpp>
#include <mirrage/utils/template_utils.hpp>
#include <moodycamel/concurrentqueue.hpp>
#include <concurrentqueue.h>
#include <memory>
#include <string>
......
......@@ -10,7 +10,7 @@
#include <mirrage/utils/atomic_utils.hpp>
#include <mirrage/utils/log.hpp>
#include <moodycamel/concurrentqueue.hpp>
#include <concurrentqueue.h>
#include <cstdint>
#include <string>
......
......@@ -13,7 +13,7 @@
#include <mirrage/utils/maybe.hpp>
#include <mirrage/utils/pool.hpp>
#include <moodycamel/concurrentqueue.hpp>
#include <concurrentqueue.h>
#include <cstdint>
#include <string>
......
......@@ -12,7 +12,7 @@
#include <mirrage/utils/reflection.hpp>
#include <mirrage/utils/template_utils.hpp>
#include <moodycamel/concurrentqueue.hpp>
#include <concurrentqueue.h>
#include <algorithm>
#include <atomic>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment