[*] hdf5/serial/1.8.14-system: fixed missing INCDIR variable (c8432e9b) · Commits · ww8it / module-environment

fftw/3.3.4-system

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ proc ModulesHelp { } {

		module-whatis "sets up the environment variables for the system fftw 3.3.4 \n\t\t To Limit the amount of cores/threads used for OpenMP \n\t\t change the 'OMP_NUM_THREADS' and 'GOMP_CPU_AFFINITY' variables.\n"

		conflict intel
		conflict fftw

		set pkghome /usr

+12 −9

Original line number	Diff line number	Diff line
		@@ -7,8 +7,9 @@ proc ModulesHelp { } {
		puts stderr "\tSets up the environment variables for system HDF5 ( GCC 5.1.1, NO MPI )\n"
		puts stderr "\t- HDF5_BASE"
		puts stderr "\t- HDF5_LIBDIR"
		puts stderr "\t- HDF5_INC"
		puts stderr "\t- HDF5_LIB"
		puts stderr "\t- HDF5_INCDIR"
		puts stderr "\t- HDF5_INC"
		puts stderr "\t- HDF5_F90_LIB"
		puts stderr "\t- HDF5_CPP_LIB (if available)"
		puts stderr "\t- LD_LIBRARY_PATH"
		@@ -18,22 +19,24 @@ proc ModulesHelp { } {
		module-whatis "sets up the environment variables for system HDF5 ( GCC 5.1.1, NO MPI )\n"

		set pkghome /usr
		set pkglibdir /usr/lib64

		conflict hdf5

		setenv HDF5_BASE $pkghome
		setenv HDF5_LIBDIR $pkghome/lib
		setenv HDF5_LIBDIR $pkglibdir
		setenv HDF5_LIB "-L$pkghomelib -lhdf5_hl -lhdf5"
		setenv HDF5_INCDIR $pkghome/include
		setenv HDF5_INC "-I$pkghome/include"
		setenv HDF5_LIB "-L$pkghome/lib -lhdf5_hl -lhdf5"
		setenv HDF5_F90_LIB "-L$pkghome/lib -lhdf5hl_fortran -lhdf5_fortran"
		if { [ file exists $pkghome/lib/libhdf5_cpp.a ] } {
		setenv HDF5_F90_LIB "-L$pkglibdir -lhdf5hl_fortran -lhdf5_fortran"
		if { [ file exists $pkghomelib/libhdf5_cpp.a ] } {
		setenv HDF5_CPP_LIB "-L$pkghome/lib -lhdf5_hl_cpp -lhdf5_cpp"
		}

		prepend-path PATH $pkghome/bin
		prepend-path LD_LIBRARY_PATH $pkghome/lib
		prepend-path LD_LIBRARY_PATH $pkglibdir

		unset pkghome

		unset pkglibdir
		#set MSG ""
		source $env(MODULESHOME)/modincludes/info_logging.tcl