Context Navigation

← Previous Change
Next Change →

Changeset 22758 for issm/trunk/externalpackages/dakota/install-6.2-linux64.sh

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

Files:

: 3 edited

. (modified) (1 prop)
externalpackages (modified) (1 prop)
externalpackages/dakota/install-6.2-linux64.sh (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 21730-21731,21736-21753,21755,21760,21762-21960,21962-21970,21974-22017,22019,22021-22022,22024-22028,22031,22033,22035-22037,22039-22081,22096-22105,22107,22109-22110,22116-22117,22122-22138,22141-22142,22145-22154,22158,22173-22178,22181,22183-22204,22207,22210-22216,22236-22243,22249-22480,22482-22493,22495-22621,22623-22649,22652-22754

issm/trunk/externalpackages

Property svn:ignore

old	new
18	18	Makefile
19	19	CMakeFiles
	20	matlab
	21	svn-commit.tmp

issm/trunk/externalpackages/dakota/install-6.2-linux64.sh

r21341	r22758
26	26	patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
27	27	patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
	28	patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch
28	29
29	30	#Apply patches

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: