From 937db3e4757073e232c851ec79c994368474afb2 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 3 Mar 2014 18:43:52 -0500 Subject: [PATCH 1/2] Update Intel compile flags as suggested by @bhermanmit. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2781f4d27d..40586ca23b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,9 +62,9 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") # Intel Fortran compiler options - set(f90flags "-fpp -warn -assume byterecl -traceback") + set(f90flags "-fpp -std08 -assume byterecl -traceback") if(debug) - set(f90flags "-g -ftrapuv -fp-stack-check -check all -fpe0 ${f90flags}") + set(f90flags "-g -warn -ftrapuv -fp-stack-check -check all -fpe0 ${f90flags}") set(ldflags "-g") endif() if(profile) From fe58e8bdebd01837485aff7aa233aa694f2ea7ad Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 4 Mar 2014 20:13:47 -0500 Subject: [PATCH 2/2] Replace pipeline for producing git SHA1 with single command. --- src/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 40586ca23b..dd0bcaaa05 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -156,9 +156,7 @@ endif() # git SHA1 hash #=============================================================================== -execute_process(COMMAND git log -1 - COMMAND head -n 1 - COMMAND cut -c8- +execute_process(COMMAND git rev-parse -q HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} RESULT_VARIABLE GIT_SHA1_SUCCESS OUTPUT_VARIABLE GIT_SHA1