Reorganized postinstall scripts.

WardF · Nov 18, 2014 · aba5029 · aba5029
1 parent 7947e31
commit aba5029
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -314,8 +314,8 @@ ENDIF()
 IF(NOT MSVC)
   OPTION(BUILD_FORTRAN "Download and build netcdf-fortran automatically (EXPERIMENTAL)." OFF)
   IF(BUILD_FORTRAN)
-    CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/fortran_install.sh.in"
-      "${CMAKE_BINARY_DIR}/fortran_install.sh"
+    CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/postinstall.sh.in"
+      "${CMAKE_BINARY_DIR}/postinstall.sh"
       @ONLY)
   ENDIF(BUILD_FORTRAN)
 ENDIF()

diff --git a/PostInstall.cmake b/PostInstall.cmake
@@ -1 +1 @@
-EXECUTE_PROCESS(COMMAND sh -c "${CMAKE_BINARY_DIR}/fortran_install.sh -t cmake")
+EXECUTE_PROCESS(COMMAND sh -c "${CMAKE_BINARY_DIR}/postinstall.sh -t cmake")
diff --git a/fortran_install.sh.in → postinstall.sh.in b/fortran_install.sh.in → postinstall.sh.in
@@ -45,10 +45,11 @@ esac
 
 if [ ! -d "netcdf-fortran" ]; then
     git clone http://github.com/unidata/netcdf-fortran
-    cd netcdf-fortran
-    git checkout v4.4.1
 fi
 
+cd netcdf-fortran
+git checkout v4.4.1
+
 ###
 # Invoke cmake to build netcdf-fortran
 ###
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		EXECUTE_PROCESS(COMMAND sh -c "${CMAKE_BINARY_DIR}/fortran_install.sh -t cmake")
		EXECUTE_PROCESS(COMMAND sh -c "${CMAKE_BINARY_DIR}/postinstall.sh -t cmake")