Skip to content
Snippets Groups Projects
Commit 5894c347 authored by Evgeny Mortikov's avatar Evgeny Mortikov
Browse files

Merge branch 'data-fix-cmake' into 'main'

added data-copy to CMAKE and passthrough for nan-check

See merge request inmcm60_pbl/inmcm60_sfx!11
parents 10359d3d 90d98896
No related branches found
No related tags found
No related merge requests found
/drag.exe
.idea
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MakefileSettings">
<option name="linkedExternalProjectsSettings">
<MakefileProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
<option name="version" value="2" />
</MakefileProjectSettings>
</option>
</component>
<component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
......@@ -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
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