mirror of https://github.com/triqs/dft_tools
[build] fix MacOS X build: add ninja as req
* Print f2py:meson build logs in github actions * add ninja as requirement
This commit is contained in:
parent
194cc57714
commit
3cf71970a5
|
@ -93,6 +93,11 @@ jobs:
|
||||||
source $HOME/install/share/triqs/triqsvars.sh
|
source $HOME/install/share/triqs/triqsvars.sh
|
||||||
mkdir build && cd build && cmake ..
|
mkdir build && cd build && cmake ..
|
||||||
make -j2 || make -j1 VERBOSE=1
|
make -j2 || make -j1 VERBOSE=1
|
||||||
|
|
||||||
|
- name: Print logs
|
||||||
|
if: ${{ failure() }}
|
||||||
|
run: |
|
||||||
|
cat $(find . -name meson-log.txt)
|
||||||
|
|
||||||
- name: Test app4triqs
|
- name: Test app4triqs
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -12,7 +12,7 @@ add_custom_target(${module_name} ALL
|
||||||
##generate the fortran python wrapper shared library
|
##generate the fortran python wrapper shared library
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${generated_module_file}
|
OUTPUT ${generated_module_file}
|
||||||
COMMAND ${TRIQS_PYTHON_EXECUTABLE} -m numpy.f2py --f90exec=${CMAKE_Fortran_COMPILER} --f77exec=${CMAKE_Fortran_COMPILER} -c ${fortran_src_file} -m ${module_name} > elk_f2py.log
|
COMMAND ${TRIQS_PYTHON_EXECUTABLE} -m numpy.f2py --build-dir ${CMAKE_CURRENT_BINARY_DIR}/meson --f90exec=${CMAKE_Fortran_COMPILER} --f77exec=${CMAKE_Fortran_COMPILER} -c ${fortran_src_file} -m ${module_name} > elk_f2py.log
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -4,3 +4,4 @@ numpy
|
||||||
scipy
|
scipy
|
||||||
meson
|
meson
|
||||||
setuptools
|
setuptools
|
||||||
|
ninja
|
Loading…
Reference in New Issue