fix vtk patch error

GEOS-DEV · Aug 27, 2024 · 4aeaf67 · 4aeaf67
1 parent 3a84c87
commit 4aeaf67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1133,7 +1133,7 @@ endif( ENABLE_MPI )
                          PREFIX ${PROJECT_BINARY_DIR}/vtk
                          URL ${VTK_URL}
                          INSTALL_DIR ${VTK_DIR}
-                         PATCH_COMMAND patch -p0 -t < ${TPL_MIRROR_DIR}/vtkXML-fpe.patch
+                         PATCH_COMMAND patch -p0 -f < ${TPL_MIRROR_DIR}/vtkXML-fpe.patch
                          BUILD_COMMAND ${TPL_BUILD_COMMAND}
                          INSTALL_COMMAND "${TPL_INSTALL_COMMAND}"
                          CMAKE_GENERATOR ${TPL_GENERATOR}

diff --git a/scripts/setupLC-TPL.bash b/scripts/setupLC-TPL.bash
@@ -25,8 +25,7 @@ mv build-* toBeDeleted
 rm -rf toBeDeleted &
 
 echo "Building all LC TPLs from $GEOS_DIR to be installed at $INSTALL_DIR"
-chmod -R g+rx $INSTALL_DIR
-chgrp -R GEOS $INSTALL_DIR
+
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby clang-14           "srun -N 1 -t 90 -n 1 -A vortex" $@ &
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby gcc-12             "srun -N 1 -t 90 -n 1 -A vortex" $@ &
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR dane gcc-12             "srun -N 1 -t 90 -n 1 -A vortex" $@ &
@@ -36,4 +35,8 @@ chgrp -R GEOS $INSTALL_DIR
 ./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-12 "lalloc 1 -qpdebug"  $@ &
 
 wait
+
+chmod -R g+rx $INSTALL_DIR
+chgrp -R GEOS $INSTALL_DIR
+
 echo "Complete"