diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2016-03-02 11:24:25 -0800 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-03-02 11:24:25 -0800 |
commit | 51f60f3a1ed2a87c0d5d1742ec5c49bf6cbd2988 (patch) | |
tree | 212a30e855426f4f410e7bcbaac7653fd70503ab /lib | |
parent | 9f6ebd7c6ee37e151f78cf30b64ee35dd43847c0 (diff) | |
parent | 6bbadbfaac406f9abe81e64f174d8a2b4c9c255e (diff) | |
download | spack-51f60f3a1ed2a87c0d5d1742ec5c49bf6cbd2988.tar.gz spack-51f60f3a1ed2a87c0d5d1742ec5c49bf6cbd2988.tar.bz2 spack-51f60f3a1ed2a87c0d5d1742ec5c49bf6cbd2988.tar.xz spack-51f60f3a1ed2a87c0d5d1742ec5c49bf6cbd2988.zip |
Merge pull request #479 from glennpj/cpath
Add CPATH pointing to include directories.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/docs/basic_usage.rst | 2 | ||||
-rw-r--r-- | lib/spack/spack/modules.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst index 0578f0c8db..f94ac3d2ba 100644 --- a/lib/spack/docs/basic_usage.rst +++ b/lib/spack/docs/basic_usage.rst @@ -896,7 +896,7 @@ Or, similarly with modules, you could type: $ spack load mpich %gcc@4.4.7 These commands will add appropriate directories to your ``PATH``, -``MANPATH``, and ``LD_LIBRARY_PATH``. When you no longer want to use +``MANPATH``, ``CPATH``, and ``LD_LIBRARY_PATH``. When you no longer want to use a package, you can type unload or unuse similarly: .. code-block:: sh diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py index c834763564..c27043db8c 100644 --- a/lib/spack/spack/modules.py +++ b/lib/spack/spack/modules.py @@ -33,6 +33,7 @@ number of directories to be appended to paths in the user's environment: * /bin directories to be appended to PATH * /lib* directories for LD_LIBRARY_PATH + * /include directories for CPATH * /man* and /share/man* directories for MANPATH * the package prefix for CMAKE_PREFIX_PATH @@ -121,6 +122,7 @@ class EnvModule(object): ('LIBRARY_PATH', self.spec.prefix.lib64), ('LD_LIBRARY_PATH', self.spec.prefix.lib), ('LD_LIBRARY_PATH', self.spec.prefix.lib64), + ('CPATH', self.spec.prefix.include), ('PKG_CONFIG_PATH', join_path(self.spec.prefix.lib, 'pkgconfig')), ('PKG_CONFIG_PATH', join_path(self.spec.prefix.lib64, 'pkgconfig'))]: |