Fix windows compilation: math and timezone (#972)

nrc-cnrc · Aug 3, 2023 · afee58e · afee58e
2 parents a40598c + 2d1a449
commit afee58e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/HEN_HOUSE/gui/egs_configure/egs_tools.cpp b/HEN_HOUSE/gui/egs_configure/egs_tools.cpp
@@ -769,7 +769,7 @@ EGS_DSO::EGS_DSO(const QString &cpp_name){
 #elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
    fpic = is_x86_64() ? "-fPIC" : QString();
 #endif
-   flibs = cpp_name.contains("g++") ? "-lgfortran" : QString();
+   flibs = cpp_name.contains("g++") ? "-lgfortran -lquadmath" : QString();
 }
 
 // Initialize default GCC compiler as gfortran
@@ -1007,7 +1007,7 @@ QString MCompiler::getFlibs2LinkCPP( const QString &f_name, const QString &a_pat
     if ( f_name.contains("g77") && name().contains("g++"))
         flibs= QString("-lg2c");
     else if ( f_name.contains("gfortran") && name().contains("g++"))
-        flibs= QString("-lgfortran");
+        flibs= QString("-lgfortran -lquadmath");
     else if ( f_name.contains("ifort") && name().contains("icpc"))
         flibs= QString("-lifport -lifcore");
     else{// using any other C++/Fortran compiler combination
@@ -1020,7 +1020,7 @@ QString MCompiler::getFlibs2LinkCPP( const QString &f_name, const QString &a_pat
 #else
   // Setting an initial guess
   if      ( f_name.contains("gfortran") && name().contains("g++") )
-          flibs="-lgfortran";
+          flibs="-lgfortran -lquadmath";
   else if ( f_name.contains("g77") )
           flibs="-lg2c";
   else if ( f_name.contains("ifort") && name().contains("icpc"))

diff --git a/HEN_HOUSE/scripts/configure b/HEN_HOUSE/scripts/configure
@@ -1813,7 +1813,7 @@ if test x$F77 = xg77 || test x$F77 = xgfortran; then
             if test x$F77 = xg77; then
                 SHLIB_LIBS="-lg2c"
             else
-                SHLIB_LIBS="-lgfortran"
+                SHLIB_LIBS="-lgfortran -lquadmath"
             fi
             printf $format "An OS X system with $F77 and $CC ... " >&2
             echo "using $SHLIB_FLAGS and $SHLIB_LIBS to build shared libraries" >&2

diff --git a/HEN_HOUSE/specs/all_common.spec b/HEN_HOUSE/specs/all_common.spec
@@ -132,17 +132,19 @@ FEXT = f
 # The git hash and branch
 GIT_HASH =
 ifeq ($(OS),Windows_NT)
-    USING_GIT = $(shell cmd /C git rev-parse --is-inside-work-tree)
+    USING_GIT = $(shell cmd /C @ECHO OFF & git rev-parse --is-inside-work-tree 2>NUL)
     ifeq ($(USING_GIT),true)
         GIT_HASH = -DGIT_HASH="\"$(shell cmd /C git rev-parse --short=7 HEAD)\""
+    else
+        GIT_HASH = -DGIT_HASH="\"unknown\""
     endif
 else
     GIT_HASH = -DGIT_HASH="\"$(shell if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then git rev-parse --short=7 HEAD; fi)\""
 endif
 
 COMPILE_TIME =
 ifeq ($(OS),Windows_NT)
-    COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T)$(shell cmd /C time /T) $(shell cmd /C tzutil /g)\""
+    COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T) $(shell cmd /C time /T)\""
 else
     COMPILE_TIME = -DCOMPILE_TIME="\"$(shell date -u +'%Y-%m-%d %H:%M:%S UTC')\""
 endif

diff --git a/HEN_HOUSE/specs/beamnrc.spec b/HEN_HOUSE/specs/beamnrc.spec
@@ -120,17 +120,19 @@ LIB_SOURCES = $(BEAM_HOME)beam_lib.macros \
 # The git hash and branch
 GIT_HASH =
 ifeq ($(OS),Windows_NT)
-    USING_GIT = $(shell cmd /C git rev-parse --is-inside-work-tree)
+    USING_GIT = $(shell cmd /C @ECHO OFF & git rev-parse --is-inside-work-tree 2>NUL)
     ifeq ($(USING_GIT),true)
         GIT_HASH = -DGIT_HASH="\"$(shell cmd /C git rev-parse --short=7 HEAD)\""
+    else
+        GIT_HASH = -DGIT_HASH="\"unknown\""
     endif
 else
     GIT_HASH = -DGIT_HASH="\"$(shell if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then git rev-parse --short=7 HEAD; fi)\""
 endif
 
 COMPILE_TIME =
 ifeq ($(OS),Windows_NT)
-    COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T)$(shell cmd /C time /T) $(shell cmd /C tzutil /g)\""
+    COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T)$(shell cmd /C time /T)\""
 else
     COMPILE_TIME = -DCOMPILE_TIME="\"$(shell date -u +'%Y-%m-%d %H:%M:%S UTC')\""
 endif