More build updates to include pxGetDiagU.c files.

balay · May 16, 2016 · 75570b4 · 75570b4
1 parent fa79300
commit 75570b4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -157,6 +157,7 @@ if (enable_parmetislib)   ## want to use parmetis
     if (NOT EXISTS ${dir})
       message(FATAL_ERROR "PARMETIS include directory not found: ${dir}")
     endif()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${dir}")
   endforeach()
 
   message("-- Enabled support for PARMETIS")

diff --git a/SRC/Makefile b/SRC/Makefile
@@ -54,7 +54,7 @@ DPLUSRC = pdgssvx.o pdgssvx_ABglobal.o \
 	  dreadhb.o dreadrb.o dreadtriple.o dreadMM.o \
 	  pdgsequ.o pdlaqgs.o dldperm_dist.o pdlangs.o pdutil.o \
 	  pdsymbfact_distdata.o ddistribute.o pddistribute.o \
-	  pdgstrf.o pdgstrf2.o pxGetDiagU.o \
+	  pdgstrf.o pdgstrf2.o pdGetDiagU.o \
 	  pdgstrs.o pdgstrs1.o pdgstrs_lsum.o pdgstrs_Bglobal.o \
 	  pdgsrfs.o pdgsmv.o pdgsrfs_ABXglobal.o pdgsmv_AXglobal.o 
 

diff --git a/make.inc.in b/make.inc.in
@@ -29,7 +29,7 @@ ARCHFLAGS    = cr
 RANLIB       = @CMAKE_RANLIB@
 
 CC           = @CMAKE_C_COMPILER@
-CFLAGS 	     = @CMAKE_C_FLAGS_RELEASE@ @CMAKE_C_FLAGS@ 
+CFLAGS 	     = @CMAKE_C_FLAGS_RELEASE@ @CMAKE_C_FLAGS@
 # CFLAGS       += -D${DirDefs}
 # CFLAGS       += @COMPILE_DEFINITIONS@ 
 NOOPTS       = -O0

diff --git a/run_cmake_build.csh b/run_cmake_build.csh
@@ -5,18 +5,18 @@ if ( ! $?NERSC_HOST ) then
 else
   if ( "$NERSC_HOST" == "edison" ) then
     setenv PARMETIS_ROOT ~/Edison/lib/parmetis-4.0.3 
-    setenv PARMETIS_BUILD_DIR ${PARMETIS_ROOT}/shared-build
-#    setenv PARMETIS_BUILD_DIR ${PARMETIS_ROOT}/static-build/Linux-x86_64
+#    setenv PARMETIS_BUILD_DIR ${PARMETIS_ROOT}/shared-build
+    setenv PARMETIS_BUILD_DIR ${PARMETIS_ROOT}/static-build/Linux-x86_64
     cmake .. \
-    -DUSE_XSDK_DEFAULTS=TRUE\
+    -DUSE_XSDK_DEFAULTS=FALSE\
     -DTPL_PARMETIS_INCLUDE_DIRS="${PARMETIS_ROOT}/include;${PARMETIS_ROOT}/metis/include" \
-    -DTPL_PARMETIS_LIBRARIES="${PARMETIS_BUILD_DIR}/libparmetis/libparmetis.so;${PARMETIS_BUILD_DIR}/libmetis/libmetis.so" \
+    -DTPL_PARMETIS_LIBRARIES="${PARMETIS_BUILD_DIR}/libparmetis/libparmetis.a;${PARMETIS_BUILD_DIR}/libmetis/libmetis.a" \
     -DCMAKE_C_FLAGS="-std=c99 -fPIC" \
-    -DCMAKE_EXE_LINKER_FLAGS="-shared" \
+#    -DCMAKE_EXE_LINKER_FLAGS="-shared" \
     -DCMAKE_Fortran_COMPILER=ftn \
     -Denable_blaslib=OFF \
-    -DTPL_BLAS_LIBRARIES=" "
-#    -DBUILD_SHARED_LIBS=OFF
+    -DTPL_BLAS_LIBRARIES=" " \
+    -DBUILD_SHARED_LIBS=OFF
   endif
 
   if ( "$NERSC_HOST" == "cori" ) then