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.

Sign up for GitHub

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

Jump to bottom

Freebsd cmake #10087

Merged
merged 7 commits into from Jul 9, 2016
Merged

Freebsd cmake #10087

merged 7 commits into from Jul 9, 2016

Conversation

Fneufneu
Copy link
Member

@Fneufneu Fneufneu commented Jul 8, 2016

Some cmake fixes to make things works on FreeBSD.
I marked [cmake] commits that can affect other platforms.

@Fneufneu Fneufneu added the CMake label Jul 8, 2016
@hudokkow
Copy link
Member

hudokkow commented Jul 8, 2016

Looks good.
CMAKE_MAKE_PROGRAM change in 7aad686 should be in 527cd07

Apart from that, only one other comment: so you're the one FreeBSD user we have, heheh.

If you have the time, can you test #9987 commenting 6f5e4a5#diff-2cec9cf9f25dcb68763ba455c63ba01bR324 out?
I'm curious and haven't had the time to test FreeBSD using linux's Install.cmake

wsnipex
wsnipex reviewed Jul 8, 2016
View reviewed changes
project/cmake/modules/FindSWIG.cmake
@@ -1,6 +1,9 @@
if(NOT SWIG_EXECUTABLE)
find_program(SWIG_EXECUTABLE NAMES swig2.0 swig PATH_SUFFIXES swig)
endif()
if(NOT SWIG_EXECUTABLE)
find_program(SWIG_EXECUTABLE NAMES swig3.0 swig PATH_SUFFIXES swig)

This comment was marked as spam.

Sign in to view

@fetzerch
Copy link
Member

fetzerch commented Jul 8, 2016

Thanks much! LGTM (besides the small minor that wsnipex mentioned already).
If you want you can also mention it in https://github.com/xbmc/xbmc/blob/master/project/cmake/README.md (maybe that way we might even find a second bsd user ;))

@Fneufneu
Copy link
Member Author

Fneufneu commented Jul 8, 2016

thanks for the feedback. i will update the pr and look at #9987 next week,
but most of the time, linux cmake files are fine for FreeBSD.

@Fneufneu
[cmake] fix ffmpeg freebsd build
28e905b 
reuse linux args
@Fneufneu
[cmake] do not hardcode make command
8108954 
use CMAKE_MAKE_PROGRAM variable to fix FreeBSD build
@Fneufneu
[cmake] also try to find swig3.0
f647131 
On FreeBSD the binary are: swig2.0 or swig3.0
so try to find version 3.0 if the 2.0 is not there
@Fneufneu
[cmake/freebsd] Update freebsd treedata
ca3cc60 
It's the linux file + xbmc/freebsd
@Fneufneu
[cmake/freebsd] Use linux Install.cmake
743ebe2
@Fneufneu
Copy link
Member Author

Fneufneu commented Jul 9, 2016

PR updated and ready to be merged.
I really need to update the README one day :) and you are more than one user on FreeBSD !
Someone send me a patch to make kodi run on RPi 2 / FreeBSD :)

@fetzerch
Copy link
Member

fetzerch commented Jul 9, 2016

Thanks, I have the readme updated together with a few more things. Will push that with my next PR.

@fetzerch fetzerch merged commit 8bd8cf4 into xbmc:master Jul 9, 2016
fetzerch
fetzerch reviewed Jul 19, 2016
View reviewed changes
project/cmake/modules/FindCpluff.cmake
@@ -22,7 +22,7 @@ if(NOT WIN32)
--host=${ARCH}
CFLAGS=${defines}
LDFLAGS=${ldflags}
BUILD_COMMAND make V=1)
BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} V=1)

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CMake
Projects
None yet
Milestone
Krypton 17.0-alpha3
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Fneufneu @hudokkow @fetzerch @wsnipex @MartijnKaijser