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

Develop windows compiler fixes #912

Merged
merged 4 commits into from
Aug 19, 2021
Merged

Develop windows compiler fixes #912

merged 4 commits into from
Aug 19, 2021

Conversation

byrnHDF
Copy link
Contributor

@byrnHDF byrnHDF commented Aug 17, 2021

No description provided.

Restore MS C++ Default exception handling behavior #885
Remove clang toolchain as it skips compiler checks
@@ -631,6 +631,12 @@
PTHREAD_SCOPE_SYSTEM) call. */
#cmakedefine H5_SYSTEM_SCOPE_THREADS @H5_SYSTEM_SCOPE_THREADS@

/* Define using v1.6 public API symbols by default */
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fix order

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd5105")
endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_LOADED)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actual change - most other changes just whitespace

@@ -1,15 +1,15 @@
# Uncomment the following to use cross-compiling
#set(CMAKE_SYSTEM_NAME Linux)

set(CMAKE_COMPILER_VENDOR "clang")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This caused the compiler checks to be skipped. Left code in case a change is needed after extensive testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will revert this because the reason this change was based on was incorrect.

src/H5private.h Outdated
@@ -44,7 +44,9 @@
#include <sys/time.h>
#endif
#ifdef H5_HAVE_UNISTD_H
#ifdef H5_HAVE_GETPWUID
Copy link
Contributor Author

Choose a reason for hiding this comment

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

mingw fix

@lrknox lrknox merged commit 2524b57 into HDFGroup:develop Aug 19, 2021
lrknox pushed a commit that referenced this pull request Aug 20, 2021
* Merge windows compiler fixes #912

* Merge changes to check for pwd.h header

* Add missing define

* Merge Remove incorrect compiler check for windows clang sanitizer #942
lrknox pushed a commit that referenced this pull request Aug 21, 2021
@byrnHDF byrnHDF deleted the develop-win-compile branch September 7, 2021 13:00
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.

3 participants