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

Update dependencies, build fixes #39

Merged
merged 9 commits into from Feb 24, 2018

Conversation

@dgladkov
Copy link
Contributor

commented Feb 16, 2018

  • Old SDL2 patch removed
  • All dependencies updated to the latest version
  • Added build/ to .gitignore
  • Bumped default OSX SDK to macosx10.13
  • Added full sysroot path lookup from SDK name string as using just the name (e.g. macosx10.13) as CMAKE_OSX_SYSROOT/-isysroot didn't work for me.
@nikolaykasyanov

This comment has been minimized.

Copy link
Member

commented Feb 16, 2018

This is great, I'll look into it during the upcoming weekend 👍
Something should be done about boost build verbosity though, it seems Travis can't handle it.

@nikolaykasyanov

This comment has been minimized.

Copy link
Member

commented Feb 17, 2018

@dgladkov I guess I know why boost build fails. Image used by Travis must be changed to Xcode 9.* in order to have 10.13 SDK available.

execute_process(COMMAND xcrun --show-sdk-path --sdk ${CMAKE_OSX_SYSROOT} OUTPUT_VARIABLE FULL_SYSROOT_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
# use CMAKE_OSX_SYSROOT as is if it points to existing directory, lookup full path otherwise
if(NOT EXISTS CMAKE_OSX_SYSROOT)
execute_process(COMMAND xcrun --show-sdk-path --sdk ${CMAKE_OSX_SYSROOT} OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)

This comment has been minimized.

Copy link
@nikolaykasyanov

nikolaykasyanov Feb 17, 2018

Member

It should be possible to fail the whole thing if xcrun fails. I suppose RESULT_VARIABLE must be passed and checked thereafter.

set(CMAKE_CXX_STANDARD 11)

execute_process(COMMAND xcrun --show-sdk-path --sdk ${CMAKE_OSX_SYSROOT} OUTPUT_VARIABLE FULL_SYSROOT_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
# use CMAKE_OSX_SYSROOT as is if it points to existing directory, lookup full path otherwise
if(NOT EXISTS CMAKE_OSX_SYSROOT)

This comment has been minimized.

Copy link
@nikolaykasyanov

nikolaykasyanov Feb 17, 2018

Member

Let's please keep if style consistent (i.e. a space before ().

@dgladkov dgladkov force-pushed the dgladkov:update_build branch from f3e93a7 to b90e17b Feb 20, 2018

@dgladkov

This comment has been minimized.

Copy link
Contributor Author

commented Feb 20, 2018

Lowering number of make jobs to 2x number of cores seems fixed OSG build timeout, but the build time difference between different runs seems to be too big to make any solid conclusions.

@nikolaykasyanov

This comment has been minimized.

Copy link
Member

commented Feb 21, 2018

@dgladkov yep, it seems like Xcode 9 builds are slower (is High Sierra to blame?). Thanks for the fixes!

@nikolaykasyanov nikolaykasyanov merged commit b7fd74c into OpenMW:master Feb 24, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.