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.

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 Ubuntu with gcc 5.2.1 #1647

Merged
merged 2 commits into from
Nov 12, 2015
Merged

Fix compilation on Ubuntu with gcc 5.2.1 #1647

merged 2 commits into from
Nov 12, 2015

Conversation

dnadeau4
Copy link
Contributor

testing if "ncurses" patch works on different machines.

@dnadeau4 dnadeau4 changed the title Fix compilatin on Ubuntu with gcc 5.2.1 Fix compilation on Ubuntu with gcc 5.2.1 Oct 29, 2015
@@ -37,11 +37,11 @@ endif()
if(CDAT_BUILD_ESMF_ESMP)
if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL GNU)
# GNU gfortran must be >= 4.3
if(${Fortran_MAJOR_VERSION} GREATER 3 AND ${Fortran_MINOR_VERSION} GREATER 2)
if(${Fortran_MAJOR_VERSION} GREATER 3 AND ${Fortran_MINOR_VERSION} GREATER 1)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is odd, I thought @chaosphere2112 had made it so that we have to have less than 5, plus 4.0 would fail with this no?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous required version was 4.3, which this would match.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confirm that this problem was present also in Debian (in my case in the current testing version). I have changed as explained,

CMake/cdat_modules/esmf_pkg.cmake

From

if(${Fortran_MAJOR_VERSION} GREATER 3 AND ${Fortran_MINOR_VERSION} GREATER 1)

to

if(${Fortran_MAJOR_VERSION} GREATER 4 AND ${Fortran_MINOR_VERSION} GREATER 0)

and the CMAKE seems to work.

@doutriaux1
Copy link
Contributor

I have a question about gfortran I think that needs to be cleaned up. Otherwise looks good to me.

@aashish24
Copy link
Contributor

@dnadeau4 the patch wouldn't break the older GCC would it?

@aashish24
Copy link
Contributor

Other than that, it looks good to me. 👍 thanks for pushing it.

@aashish24
Copy link
Contributor

@dnadeau4 are you going to update it? with CMake version LESS ...of CMake..

@dnadeau4
Copy link
Contributor Author

I will when I get a chance.

@dnadeau4
Copy link
Contributor Author

@aashish24 Done!

@dnadeau4
Copy link
Contributor Author

@doutriaux1 can you take a look at the CMAKE version for gfortran.

@aashish24
Copy link
Contributor

thanks @dnadeau4 on a quick look at it it looks good. I will have a closer look at it.

@doutriaux1
Copy link
Contributor

@aashish24 since it's all CMake I will let you d the final merge, but it looks good.

@aashish24
Copy link
Contributor

LGTM 👍 thanks @dnadeau4

aashish24 added a commit that referenced this pull request Nov 12, 2015
Fix compilation on Ubuntu with gcc 5.2.1
@aashish24 aashish24 merged commit 0dc576f into master Nov 12, 2015
@aashish24 aashish24 deleted the curses_update branch November 12, 2015 03:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants