LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-11-18 12:03:50 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable

Browse Source
This commit is contained in:
Nils Wentzell 2020-10-09 09:28:38 -04:00
commit 4525076ed6
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -79,7 +79,7 @@ jobs:
CXX: ${{ matrix.cxx }} CXX: ${{ matrix.cxx }}
LIBRARY_PATH: /usr/local/opt/llvm/lib LIBRARY_PATH: /usr/local/opt/llvm/lib
run: | run: |
source $HOME/install/share/triqsvars.sh source $HOME/install/share/triqs/triqsvars.sh
mkdir build && cmake -B build mkdir build && cmake -B build
cmake --build build -j2 cmake --build build -j2
@ -87,6 +87,6 @@ jobs:
env: env:
DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib
run: | run: |
source $HOME/install/share/triqsvars.sh source $HOME/install/share/triqs/triqsvars.sh
cd build cd build
ctest -j2 --output-on-failure ctest -j2 --output-on-failure

2
doc/install.rst
View File

@ -54,7 +54,7 @@ Installation steps
#. Ensure that your shell contains the TRIQS environment variables by sourcing the ``triqsvars.sh`` file from your TRIQS installation:: #. Ensure that your shell contains the TRIQS environment variables by sourcing the ``triqsvars.sh`` file from your TRIQS installation::
$ source path_to_triqs/share/triqsvarsh.sh $ source path_to_triqs/share/triqs/triqsvars.sh
#. In the build directory call cmake, including any additional custom CMake options, see below:: #. In the build directory call cmake, including any additional custom CMake options, see below::

2
packaging/conda/build.sh
View File

@ -10,7 +10,7 @@ export OMPI_MCA_rmaps_base_oversubscribe=yes
export OMPI_MCA_btl_vader_single_copy_mechanism=none export OMPI_MCA_btl_vader_single_copy_mechanism=none
mpiexec="mpiexec --allow-run-as-root" mpiexec="mpiexec --allow-run-as-root"
source $PREFIX/share/triqsvars.sh source $PREFIX/share/triqs/triqsvars.sh
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX \

27
share/CMakeLists.txt
View File

@ -1,6 +1,10 @@
add_subdirectory(cmake) add_subdirectory(cmake)
if(NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT AND NOT IS_SUBPROJECT) if(NOT IS_SUBPROJECT
AND NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT
AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr"
AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr/local"
)
if(PythonSupport) if(PythonSupport)
set(EXPORT_PYTHON_PATH "export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CPP2PY_PYTHON_LIB_DEST_ROOT}:$PYTHONPATH") set(EXPORT_PYTHON_PATH "export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CPP2PY_PYTHON_LIB_DEST_ROOT}:$PYTHONPATH")
@ -14,15 +18,20 @@ if(NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT AND NOT IS_SUBPROJECT)
FILES FILES
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.modulefile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.modulefile
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}vars.sh ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}vars.sh
DESTINATION share DESTINATION share/${PROJECT_NAME}
) )
message(STATUS "***************************************************************") message(STATUS "*********************************************************************************")
message(STATUS "* Custom install Location. Use: ") message(STATUS "* Custom install Location. Use: ")
message(STATUS "* ") message(STATUS "* ")
message(STATUS "* source ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}vars.sh ") message(STATUS "* source ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/${PROJECT_NAME}vars.sh ")
message(STATUS "* ") message(STATUS "* ")
message(STATUS "* to set up the environment variables ") message(STATUS "* to set up the environment variables ")
message(STATUS "***************************************************************") if(DEFINED ENV{MODULEPATH})
message(STATUS "* ")
message(STATUS "* Consider copying ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.modulefile ")
message(STATUS "* into your environment module directories ")
endif()
message(STATUS "*********************************************************************************")
endif() endif()

3
share/cmake/triqs_dft_tools-config.cmake.in
View File

@ -33,5 +33,8 @@ set(@PROJECT_NAME@_WITH_DOCUMENTATION @Build_Documentation@ CACHE BOOL "Was @PRO
# Was the Project built with PythonSupport? # Was the Project built with PythonSupport?
set(@PROJECT_NAME@_WITH_PYTHON_SUPPORT @PythonSupport@ CACHE BOOL "Was @PROJECT_NAME@ build with python support?") set(@PROJECT_NAME@_WITH_PYTHON_SUPPORT @PythonSupport@ CACHE BOOL "Was @PROJECT_NAME@ build with python support?")
if(@PythonSupport@)
set(@PROJECT_NAME@_MODULE_DIR @CMAKE_INSTALL_PREFIX@/@CPP2PY_PYTHON_LIB_DEST_ROOT@ CACHE BOOL "The @PROJECT_NAME@ python module directory")
endif()
endif() endif()