Skip to content
Snippets Groups Projects
Commit 3f01780e authored by Abhinav Singh's avatar Abhinav Singh
Browse files

Merge branch 'master' into FD_solver

# Conflicts:
#	src/CMakeLists.txt
parents dfcf0a2d 037e4db6
No related branches found
No related tags found
No related merge requests found
Pipeline #4352 failed
......@@ -34,7 +34,7 @@ if ( HIP_ENABLE AND HIP_FOUND )
else()
add_executable(io main.cpp
add_executable(io main.cpp
MetaParser/MetaParser_unit_test.cpp
${CUDA_SOURCES}
ObjReader/ObjReader_unit_test.cpp)
......@@ -44,6 +44,11 @@ endif()
add_dependencies(io ofpmmemory)
add_dependencies(io vcluster)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(io PRIVATE "-Wno-undefined-var-template")
target_compile_options(io PRIVATE "-Wno-macro-redefined")
endif()
if ( CMAKE_COMPILER_IS_GNUCC )
target_compile_options(io PRIVATE "-Wno-deprecated-declarations")
if (TEST_COVERAGE)
......@@ -51,6 +56,8 @@ if ( CMAKE_COMPILER_IS_GNUCC )
endif()
endif()
if (CMAKE_CUDA_COMPILER_ID STREQUAL "Clang")
add_definitions(-D__STRICT_ANSI__)
endif()
......@@ -58,6 +65,7 @@ endif()
###########################
if (CUDA_FOUND)
target_compile_options(io PUBLIC $<$<COMPILE_LANGUAGE:CUDA>: ${WARNING_SUPPRESSION_AND_OPTION_NVCC} >)
target_include_directories (io PUBLIC ${MPI_C_INCLUDE_DIRS})
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 )
......@@ -107,21 +115,21 @@ endif()
install(FILES RawReader/RawReader.hpp
RawReader/RawReader_unit_tests.hpp
DESTINATION openfpm_io/include/RawReader
DESTINATION openfpm_io/include/RawReader
COMPONENT OpenFPM)
install(FILES CSVWriter/csv_multiarray.hpp
CSVWriter/CSVWriter.hpp
CSVWriter/is_csv_writable.hpp
DESTINATION openfpm_io/include/CSVWriter/
DESTINATION openfpm_io/include/CSVWriter/
COMPONENT OpenFPM)
install(FILES GraphMLWriter/GraphMLWriter.hpp
DESTINATION openfpm_io/include/GraphMLWriter
DESTINATION openfpm_io/include/GraphMLWriter
COMPONENT OpenFPM)
install(FILES util/util.hpp util/GBoxes.hpp
DESTINATION openfpm_io/include/util
DESTINATION openfpm_io/include/util
COMPONENT OpenFPM)
install(FILES VTKWriter/VTKWriter.hpp
......@@ -134,11 +142,11 @@ install(FILES VTKWriter/VTKWriter.hpp
VTKWriter/VTKWriter_grids_util.hpp
VTKWriter/VTKWriter_vector_box.hpp
VTKWriter/is_vtk_writable.hpp
DESTINATION openfpm_io/include/VTKWriter/
DESTINATION openfpm_io/include/VTKWriter/
COMPONENT OpenFPM)
install(FILES MetaParser/MetaParser.hpp
DESTINATION openfpm_io/include/MetaParser/
DESTINATION openfpm_io/include/MetaParser/
COMPONENT OpenFPM)
install(FILES HDF5_wr/HDF5_wr.hpp
......@@ -160,7 +168,7 @@ install(FILES util/PathsAndFiles.hpp
COMPONENT OpenFPM)
install(FILES Plot/GoogleChart.hpp Plot/util.hpp
DESTINATION openfpm_io/include/Plot
DESTINATION openfpm_io/include/Plot
COMPONENT OpenFPM)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment