Skip to content
Snippets Groups Projects
Commit 09ba6cf0 authored by Helen Schottenhamml's avatar Helen Schottenhamml
Browse files

Merge branch 'thoennes/fix-python' into 'master'

import/export Python_EXECUTABLE which is required for apps that use codegen

See merge request walberla/walberla!506
parents 6dabcc3a b773881f
No related merge requests found
...@@ -176,6 +176,8 @@ function ( waLBerla_export ) ...@@ -176,6 +176,8 @@ function ( waLBerla_export )
set( WALBERLA_CXX_STANDARD_REQUIRED ${CMAKE_CXX_STANDARD_REQUIRED} CACHE INTERNAL "CXX Standard Required") set( WALBERLA_CXX_STANDARD_REQUIRED ${CMAKE_CXX_STANDARD_REQUIRED} CACHE INTERNAL "CXX Standard Required")
set( WALBERLA_CXX_EXTENSIONS ${CMAKE_CXX_EXTENSIONS} CACHE INTERNAL "CXX Extensions") set( WALBERLA_CXX_EXTENSIONS ${CMAKE_CXX_EXTENSIONS} CACHE INTERNAL "CXX Extensions")
set( WALBERLA_Python_EXECUTABLE ${Python_EXECUTABLE} CACHE INTERNAL "Python EXECUTABLE")
endfunction( waLBerla_export) endfunction( waLBerla_export)
####################################################################################################################### #######################################################################################################################
...@@ -235,6 +237,8 @@ function ( waLBerla_import ) ...@@ -235,6 +237,8 @@ function ( waLBerla_import )
set( CMAKE_CXX_STANDARD_REQUIRED ${WALBERLA_STANDARD_REQUIRED} PARENT_SCOPE) set( CMAKE_CXX_STANDARD_REQUIRED ${WALBERLA_STANDARD_REQUIRED} PARENT_SCOPE)
set( CMAKE_CXX_EXTENSIONS ${WALBERLA_EXTENSIONS} PARENT_SCOPE) set( CMAKE_CXX_EXTENSIONS ${WALBERLA_EXTENSIONS} PARENT_SCOPE)
set( Python_EXECUTABLE ${WALBERLA_Python_EXECUTABLE} PARENT_SCOPE)
link_directories( ${WALBERLA_LINK_DIRS} ) link_directories( ${WALBERLA_LINK_DIRS} )
endfunction( waLBerla_import) endfunction( waLBerla_import)
####################################################################################################################### #######################################################################################################################
......
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