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

Modifications for Intel compilers #1117

Merged
merged 2 commits into from Sep 11, 2018
Merged

Modifications for Intel compilers #1117

merged 2 commits into from Sep 11, 2018

Conversation

mwtoews
Copy link
Member

@mwtoews mwtoews commented Sep 11, 2018

Some changes to allow compilation with Intel compilers

  • Specify C++11 for Intel, and also workaround a CMake Error with empty variables
  • Intel 17.0 does not have good support for constexpr, but it seems const is fine for these contexts

Also, workaround issue:

CMake Error at test/unit/CMakeLists.txt:7 (string):
  string sub-command REGEX, mode REPLACE needs at least 6 arguments
  total to command.
@kbevers
Copy link
Member

kbevers commented Sep 11, 2018

Is this a fix related to PROJ 5.2 RC1?

@mwtoews
Copy link
Member Author

mwtoews commented Sep 11, 2018

yes for 5.2 RC1. After these modifications, all ll tests pass with Intel's CC=icc CXX=icpc.

else ()
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if we shouldn't set a CMake 3.1 minimum and do this sometime soon (not for this patch, which looks fine IMO)

set (CMAKE_CXX_STANDARD 11)

Copy link
Member Author

Choose a reason for hiding this comment

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

I looked into this briefly, and it seems that this was brought in after CMake 2.6.0 (the current minimum version at the top of the file)

@kbevers
Copy link
Member

kbevers commented Sep 11, 2018

@mwtoews

yes for 5.2 RC1. After these modifications, all ll tests pass with Intel's CC=icc CXX=icpc.

Great. Thanks for fixing this!

@hobu

I wonder if we shouldn't set a CMake 3.1 minimum and do this sometime soon (not for this > patch, which looks fine IMO)

set (CMAKE_CXX_STANDARD 11)

This especially makes sense once the WKT code is merged. Please add a ticket on this so we remember :-)

@kbevers kbevers merged commit a617ef8 into OSGeo:master Sep 11, 2018
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.

None yet

3 participants