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

vs2015 fixes #63

Merged
merged 1 commit into from
Jun 2, 2016
Merged

vs2015 fixes #63

merged 1 commit into from
Jun 2, 2016

Conversation

kenji123
Copy link
Member

@kenji123 kenji123 commented Jun 2, 2016

Most recent libxml2 version has vs2015 compiler check (a probably others) that fixes #62.

@kenji123
Copy link
Member Author

kenji123 commented Jun 2, 2016

compiles fine on osx once project/cmake/scripts/osx/Macros.cmake is symlinked to project/cmake/scripts/darwin/Macros.cmake

@kenji123 kenji123 merged commit fb24eda into kodi-pvr:master Jun 2, 2016
@hudokkow
Copy link
Contributor

hudokkow commented Jun 2, 2016

compiles fine on osx once project/cmake/scripts/osx/Macros.cmake is symlinked to project/cmake/scripts/darwin/Macros.cmake

?

@kenji123
Copy link
Member Author

kenji123 commented Jun 2, 2016

CMake Error at /Users/travis/build/kodi-pvr/xbmc/project/cmake/scripts/common/Macros.cmake:4 (include): include could not find load file: /Users/travis/build/kodi-pvr/xbmc/project/cmake/scripts/osx/Macros.cmake Call Stack (most recent call first): /Users/travis/build/kodi-pvr/pvr.stalker/build/build/depends/lib/kodi/PrepareEnv.cmake:2 (include) CMakeLists.txt:186 (include)
From https://travis-ci.org/kodi-pvr/pvr.stalker/jobs/134633387

In https://github.com/xbmc/xbmc/blob/master/project/cmake/scripts/common/Macros.cmake#L4, CORE_SYSTEM_NAME evals to "osx" but no osx directory exists. Doing what I did above lets the build continue.

@hudokkow
Copy link
Contributor

hudokkow commented Jun 3, 2016

That's weird. Older build jobs don't complain about it. See https://travis-ci.org/kodi-pvr/pvr.stalker/jobs/131725926 for an example. I can see a line with:

No platform specific file /Users/travis/build/kodi-pvr/xbmc/project/cmake/addons/depends/osx/CMakeLists.txt found

but build finishes fine.

@kenji123
Copy link
Member Author

kenji123 commented Jun 3, 2016

Take a look here: https://github.com/xbmc/xbmc/blob/e47fe61c9176d9b03c8eabf71b82d43821a26039/project/cmake/scripts/common/PrepareEnv.cmake#L2

Those first 3 lines were added in that same commit. I'm not certain, but it appears the include() of Macros.cmake wasn't even happening when that older build was done.

@hudokkow
Copy link
Contributor

hudokkow commented Jun 3, 2016

Yeap, you're right. One can never account for everything. 😉
Will fix.

@fetzerch
Copy link

fetzerch commented Jun 4, 2016

@hudokkow: There's a mismatch in Toolchain_binaddons.cmake.in and Toolchain.cmake.in. It should work "tm" if we just add these lines to Toolchain.cmake.in

elseif("${OS}" STREQUAL "osx")                                                             
  set(CORE_SYSTEM_NAME osx)

and rename the darwin folder to osx.

I've discussed that also some time ago with Memphiz, but never found the time to test it. Nowadays we could just use Jenkins to build it.

@hudokkow
Copy link
Contributor

hudokkow commented Jun 4, 2016

I'll give it a go. This all osx/darwin mess is meh.

@hudokkow
Copy link
Contributor

hudokkow commented Jun 5, 2016

xbmc/xbmc#9919 should fix this

@kenji123 kenji123 deleted the vs2015 branch June 9, 2016 03:02
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