Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation on windows for some time zones, add lquadmath #972

Merged
merged 4 commits into from
Aug 3, 2023
Merged

Fix compilation on windows for some time zones, add lquadmath #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e155d1e
Fix windows COMPILE_TIME string length bug
rtownson Mar 7, 2023
6505dce
Add lquadmath library when lgfortran is used
rtownson Mar 7, 2023
2595c3f
Remove compile time timezone from beamnrc spec
rtownson May 18, 2023
2d1a449
Fix GIT_HASH compile error on windows
rtownson Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions HEN_HOUSE/gui/egs_configure/egs_tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion HEN_HOUSE/scripts/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions HEN_HOUSE/specs/all_common.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions HEN_HOUSE/specs/beamnrc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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