mirror of
https://github.com/triqs/dft_tools
synced 2025-01-08 20:33:16 +01:00
[cmake] Remove remainders of separate cpp2py install (now included with triqs)
This commit is contained in:
parent
66164ed8a4
commit
57c5c8a892
@ -23,12 +23,6 @@ install: true
|
||||
|
||||
script:
|
||||
- export INSTALL_DIR=$HOME/root_install # We should install outside the repository
|
||||
# ===== Set up Cpp2Py
|
||||
- git clone https://github.com/triqs/cpp2py
|
||||
- mkdir cpp2py/build && cd cpp2py/build
|
||||
- cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/${CXX} -DPYTHON_INTERPRETER=/usr/bin/python -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
|
||||
- make -j8 install
|
||||
- source $INSTALL_DIR/share/cpp2pyvars.sh
|
||||
# ===== Set up TRIQS
|
||||
- cd $TRAVIS_BUILD_DIR
|
||||
- git clone https://github.com/TRIQS/triqs --branch unstable
|
||||
|
@ -25,7 +25,6 @@ Installation steps
|
||||
|
||||
#. Make sure that you have added the TRIQS and Cpp2Py installation to your environment variables::
|
||||
|
||||
$ source path_to_triqs/share/cpp2pyvarsh.sh
|
||||
$ source path_to_triqs/share/triqsvarsh.sh
|
||||
|
||||
#. In the build directory call cmake::
|
||||
|
@ -20,9 +20,9 @@ proc ModulesHelp { } {
|
||||
puts stderr "Git hash: $git_hash"
|
||||
}
|
||||
|
||||
# You may need to edit the next line if cpp2py module is installed
|
||||
# under a different name in your setup.
|
||||
prereq cpp2py/@CPP2PY_VERSION@
|
||||
# You may need to edit the next line if the triqs module
|
||||
# is installed under a different name in your setup.
|
||||
prereq triqs/@TRIQS_VERSION@
|
||||
|
||||
# Only one version of app4triqs can be loaded at a time
|
||||
conflict $name
|
||||
@ -35,5 +35,5 @@ prepend-path PATH $root/bin
|
||||
prepend-path CPLUS_INCLUDE_PATH $root/include
|
||||
prepend-path LIBRARY_PATH $root/lib
|
||||
prepend-path LD_LIBRARY_PATH $root/lib
|
||||
prepend-path PYTHONPATH $root/@CPP2PY_PYTHON_LIB_DEST_ROOT@
|
||||
prepend-path CMAKE_PREFIX_PATH $root/lib/cmake/triqs
|
||||
prepend-path PYTHONPATH $root/@TRIQS_PYTHON_LIB_DEST_ROOT@
|
||||
prepend-path CMAKE_PREFIX_PATH $root/lib/cmake/app4triqs
|
||||
|
Loading…
Reference in New Issue
Block a user