Changeset 1507

Timestamp:

08/03/09 13:49:41 (16 years ago)

Author:

Mathieu Morlighem

Message:

adopt one structure for all external package

Location:

issm/trunk/externalpackages/dakota

Files:

• configs/altix64 (moved) (moved from issm/trunk/externalpackages/dakota/configs/gemini )
• configs/linux64 (moved) (moved from issm/trunk/externalpackages/dakota/configs/wilkes )
• configs/macosx32 (moved) (moved from issm/trunk/externalpackages/dakota/configs/mac )
• install.sh (modified) (2 diffs)

issm/trunk/externalpackages/dakota/install.sh

@@ -1 +1 @@
 #!/bin/bash
 
-#Get number of cpus on current platform
-NUMCPUS=`grep -c processor /proc/cpuinfo`;
+#Get number of cpus
+NUMCPUS=$1;
 
 #Some cleanup
@@ -72 +72 @@
 
 
-#Compile dakota
+#Compile and install dakota
 cd src 
-make  -j $NUMCPUS
-
-#Install dakota
-make  -j $NUMCPUS install
-
+if [ -z $NUMCPUS ];
+then
+        make
+        make install
+else
+        make  -j $NUMCPUS
+        make  -j $NUMCPUS install
+fi
 
 #Weird behaviour of Dakota: libamplsolver.a and amplsolver.a are not the same thing!