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

[cmake] Move to root #10446

Merged
merged 3 commits into from Dec 22, 2016
Merged

[cmake] Move to root #10446

merged 3 commits into from Dec 22, 2016

Conversation

hudokkow
Copy link
Member

@hudokkow hudokkow commented Sep 9, 2016

Just to get the ball rolling.
cc/ @fetzerch, @wsnipex, @notspiff and anyone else interested in testing/debugging.

Build-tested under linux (core/addons).

buildsteps/depends stuff separated on purpose. Unified deps and jenkins scripts are voodoo to me.

@hudokkow hudokkow added WIP PR that is still being worked on CMake v18 Leia labels Sep 9, 2016
@hudokkow hudokkow force-pushed the cmake_move_to_root branch 3 times, most recently from 472f9b5 to cbd69e8 Compare September 16, 2016 13:42
@hudokkow hudokkow force-pushed the cmake_move_to_root branch 7 times, most recently from 4d17318 to e636efa Compare September 30, 2016 12:24
@fetzerch
Copy link
Member

fetzerch commented Oct 7, 2016

this btw would also allow later also to get rid of the CORE_SOURCE_DIR variable (and we can use CMAKE_SOURCE_DIR) instead

@hudokkow
Copy link
Member Author

hudokkow commented Oct 7, 2016

Yeap, that's the plan. BTW, I need a bool in jenkins to test this. Something like "CMakeLists.txt is in root folder."

Crap, need to rebase again.

@Paxxi
Copy link
Member

Paxxi commented Oct 7, 2016

Can we get rid of the treedata with this? It feels wrong but maybe there's a good reason for it that I am missing

@fetzerch
Copy link
Member

fetzerch commented Oct 7, 2016

The treedata is sth different. That tells cmake which CMakeLists from which subfolders to include.
Alternative is to use add_subdirectories in the main CMakeLists.txt and all that contain folders.
I think @notspiff's main intention with that was to be able to conditionally include folders on a per platform level. I don't have a very strong opinion about it, the add_subdirectories approach is probably easier to understand for people that have used cmake in other projects.

@Paxxi
Copy link
Member

Paxxi commented Oct 7, 2016

That's my thinking, add_directory is easier to follow and translates better between projects. I know it's not really related but thought maybe we can sneak it in here

@hudokkow hudokkow force-pushed the cmake_move_to_root branch 2 times, most recently from 979a515 to 955d3d1 Compare October 7, 2016 17:53
@notspiff
Copy link
Contributor

notspiff commented Oct 7, 2016

Separation of code and data is the reason.

  1. okt. 2016 19:36 skrev "Pär Björklund" notifications@github.com:

That's my thinking, add_directory is easier to follow and translates
better between projects. I know it's not really related but thought maybe
we can sneak it in here


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#10446 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AFktYPWIA-nXyGYQQUAz4kSBrwvR6Dspks5qxoMNgaJpZM4J5fjm
.

@afedchin
Copy link
Member

afedchin commented Oct 7, 2016

+1 to get rid of treedata. I think add_directory for each first level subdirectory it'a a better way.
something like this afedchin@84aa2cb?diff=unified#diff-3de6f69aaaeae7bbc934887287370c56R69

@hudokkow hudokkow force-pushed the cmake_move_to_root branch 3 times, most recently from 16e31f1 to 6f0533b Compare October 11, 2016 08:30
@hudokkow hudokkow force-pushed the cmake_move_to_root branch 3 times, most recently from ea1f1c1 to e2f508d Compare October 22, 2016 22:39
@hudokkow hudokkow force-pushed the cmake_move_to_root branch 2 times, most recently from 0e1b4bf to 1895245 Compare October 29, 2016 14:26
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 9, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 10, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 12, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 13, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 13, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 13, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 14, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 14, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 14, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 15, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 15, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 17, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 17, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 17, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 17, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 18, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 18, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
@hudokkow hudokkow mentioned this pull request Apr 19, 2017
13 tasks
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 19, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 19, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 20, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 20, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 21, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 22, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 22, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 22, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 23, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 23, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-cmake-add-FindIconv.cmake.patch
- 0003-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008

Signed-off-by: fli4l <fli4l@fli4lbuild64.lan.fli4l>
bkuhls added a commit to bkuhls/buildroot that referenced this pull request Apr 24, 2017
Rebased patches
- 0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
- 0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
after move of project/cmake in xbmc/xbmc#10446

Updated dependencies
- fmt
  xbmc/xbmc#11039
- yajl was replaced by RapidJSON
  xbmc/xbmc#8008
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants