From 380b380589316e76cd1d2a345f435b9d0ab3ecef Mon Sep 17 00:00:00 2001 From: Debolskiy Andrey <and.debol@gmail.com> Date: Mon, 18 Dec 2023 13:54:11 +0300 Subject: [PATCH] added data-copy to CMAKE and passthrough for nan-check --- .idea/git_toolbox_prj.xml | 15 +++++++++++++++ CMakeLists.txt | 21 ++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 .idea/git_toolbox_prj.xml diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml new file mode 100644 index 0000000..02b915b --- /dev/null +++ b/.idea/git_toolbox_prj.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="GitToolBoxProjectSettings"> + <option name="commitMessageIssueKeyValidationOverride"> + <BoolValueOverride> + <option name="enabled" value="true" /> + </BoolValueOverride> + </option> + <option name="commitMessageValidationEnabledOverride"> + <BoolValueOverride> + <option name="enabled" value="true" /> + </BoolValueOverride> + </option> + </component> +</project> \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index d4508ab..2d90233 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,10 @@ option(INCLUDE_CXX "CXX build in mode" OFF) project(INMCM_sfx) enable_language(Fortran) +if (SFX_CHECK_NAN) + add_definitions(-DSFX_CHECK_NAN) +endif () + if(INCLUDE_CXX) set(RUN_MACRO -DINCLUDE_CXX) endif(INCLUDE_CXX) @@ -37,7 +41,7 @@ set(SOURCES_F srcF/FCWrapper.F90 ) -set(HEADERS_F +set(HEADERS_F includeF/sfx_def.fi ) @@ -68,16 +72,16 @@ if(INCLUDE_CUDA) endif(INCLUDE_CUDA) if(INCLUDE_CXX OR INCLUDE_CUDA) - set(MEMPROC_SOURCES_CXX + set(MEMPROC_SOURCES_CXX srcCXX/MemoryProcessing.cpp ) - set(MEMPROC_HEADERS_CXX + set(MEMPROC_HEADERS_CXX includeCXX/MemoryProcessing.h includeCXX/TemplateParameters.h ) if(INCLUDE_CUDA) - set(MEMPROC_SOURCES_CU + set(MEMPROC_SOURCES_CU srcCU/MemoryProcessing.cu ) set(MEMPROC_HEADERS_CU @@ -91,4 +95,11 @@ set(SOURCES ${MEMPROC_HEADERS_CU} ${MEMPROC_SOURCES_CU} ${MEMPROC_HEADERS_CXX} $ set(CMAKE_Fortran_FLAGS " -cpp ") add_executable(drag ${SOURCES}) add_definitions(${RUN_MACRO}) -set_property(TARGET drag PROPERTY LINKER_LANGUAGE Fortran) \ No newline at end of file +set_property(TARGET drag PROPERTY LINKER_LANGUAGE Fortran) + +#copy data on post build +add_custom_command( + TARGET drag POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/data + ${CMAKE_CURRENT_BINARY_DIR}/data) \ No newline at end of file -- GitLab