Commit 50c49896 authored by Jørgen Lind's avatar Jørgen Lind
Browse files

Merge branch feature/jorgen.lind/fix_documentation with refs/heads/master into...

Merge branch feature/jorgen.lind/fix_documentation with refs/heads/master into refs/merge-requests/447/train
parents fcd747bc 8780be26
Pipeline #58586 passed with stages
in 18 minutes and 37 seconds
......@@ -221,6 +221,7 @@ configure_file(CMake/InstalledPaths.cmake.in ${CMAKE_BINARY_DIR}/CMake/Installed
install(FILES CMake/CopyDllForTarget.cmake CMake/SetWarnings.cmake ${CMAKE_BINARY_DIR}/CMake/InstalledPaths.cmake
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/openvds/examples/modules)
install(DIRECTORY examples DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/openvds)
install(DIRECTORY common/noise DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/openvds/examples/common)
configure_file(docker/build_scripts/README.txt.in ${CMAKE_BINARY_DIR}/README.txt)
install(FILES ${CMAKE_SOURCE_DIR}/Attributions.md ${CMAKE_BINARY_DIR}/README.txt ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_PREFIX}/)
......
cmake_minimum_required(VERSION 3.16.0)
project(OpenVDSExamples)
if (CMAKE_PROJECT_NAME STREQUAL "OpenVDSExamples")
set(COMMON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/common)
include(modules/InstalledPaths.cmake)
include(modules/SetWarnings.cmake)
include(modules/CopyDllForTarget.cmake)
......
......@@ -4,6 +4,7 @@ if (OpenMP_CXX_FOUND)
target_link_libraries(slicedump PRIVATE OpenMP::OpenMP_CXX)
endif()
set_target_properties(slicedump PROPERTIES FOLDER examples)
target_include_directories(slicedump PRIVATE ${COMMON_DIR})
setWarningFlagsForTarget(slicedump)
copyDllForTarget(slicedump)
......@@ -7,7 +7,7 @@
#include <OpenVDS/MetadataContainer.h>
#include <OpenVDS/VolumeDataLayout.h>
#include <OpenVDS/VolumeDataAccess.h>
#include <OpenVDS/SimplexNoiseKernel.h>
#include <Noise/SimplexNoiseKernel.h>
#include <random>
......
......@@ -142,6 +142,8 @@ set_target_properties(openvds-javacpp PROPERTIES
copyDllForTarget(openvds-javacpp)
target_include_directories(openvds-javacpp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/include)
target_include_directories(openvds-javacpp PUBLIC ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
target_include_directories(openvds-javacpp PRIVATE ${COMMON_DIR})
target_link_libraries(openvds-javacpp PRIVATE openvds openvds-java-generated-headers)
# Install jar and natives
......
......@@ -32,7 +32,7 @@
#include <OpenVDS/MetadataContainer.h>
#include <OpenVDS/VolumeDataLayout.h>
#include <OpenVDS/VolumeDataAccess.h>
#include <OpenVDS/SimplexNoiseKernel.h>
#include <Noise/SimplexNoiseKernel.h>
#include <random>
......
......@@ -41,10 +41,14 @@ struct Vector
Vector()
: data{}
{}
#ifndef DOXYGEN_SHOULD_SKIP_THIS
template<typename ...Args>
Vector(Args... args)
: data{args...}
{}
#endif
inline T &operator[] (size_t n) { return data[n]; }
inline const T &operator[] (size_t n) const { return data[n]; }
};
......
......@@ -7,7 +7,7 @@
#include <OpenVDS/MetadataContainer.h>
#include <OpenVDS/VolumeDataLayout.h>
#include <OpenVDS/VolumeDataAccess.h>
#include <OpenVDS/SimplexNoiseKernel.h>
#include <Noise/SimplexNoiseKernel.h>
#include <random>
......
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