Skip to content
Snippets Groups Projects
Commit 448e9087 authored by Frederik Hennig's avatar Frederik Hennig
Browse files

Merge branch 'fix_pystencils_include_path' into 'master'

the pystencils include directory is now added to the include paths

See merge request !9
parents c70a1c03 953968c3
Branches WallLaw
1 merge request!9the pystencils include directory is now added to the include paths
Pipeline #71547 passed with stages
in 2 minutes and 27 seconds
...@@ -20,6 +20,9 @@ function(_pssfg_add_gen_source target script) ...@@ -20,6 +20,9 @@ function(_pssfg_add_gen_source target script)
OUTPUT_VARIABLE generatedSources RESULT_VARIABLE _pssfg_result OUTPUT_VARIABLE generatedSources RESULT_VARIABLE _pssfg_result
ERROR_VARIABLE _pssfg_stderr) ERROR_VARIABLE _pssfg_stderr)
execute_process(COMMAND ${Python_EXECUTABLE} -c "from pystencils.include import get_pystencils_include_path; print(get_pystencils_include_path(), end='')"
OUTPUT_VARIABLE _Pystencils_INCLUDE_DIR)
if(NOT (${_pssfg_result} EQUAL 0)) if(NOT (${_pssfg_result} EQUAL 0))
message( FATAL_ERROR ${_pssfg_stderr} ) message( FATAL_ERROR ${_pssfg_stderr} )
endif() endif()
...@@ -37,7 +40,7 @@ function(_pssfg_add_gen_source target script) ...@@ -37,7 +40,7 @@ function(_pssfg_add_gen_source target script)
WORKING_DIRECTORY "${generatedSourcesDir}") WORKING_DIRECTORY "${generatedSourcesDir}")
target_sources(${target} PRIVATE ${generatedSourcesAbsolute}) target_sources(${target} PRIVATE ${generatedSourcesAbsolute})
target_include_directories(${target} PRIVATE ${PystencilsSfg_GENERATED_SOURCES_DIR}) target_include_directories(${target} PRIVATE ${PystencilsSfg_GENERATED_SOURCES_DIR} ${_Pystencils_INCLUDE_DIR})
endfunction() endfunction()
......
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