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

Merge branch 'master' into fhennig/nox

parents e8874138 448e9087
No related branches found
No related tags found
1 merge request!10Introduce Nox for Test Automation
Pipeline #71685 passed
...@@ -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% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment