NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
019ad60567
kumquat-buildroot/package/cmake/0001-rename_cmake_rootfile.patch

30 lines
1.1 KiB
Diff
Raw Normal View History

package/cmake: make ctest a target package too Useful for packages shipped with a testsuite which makes use of ctest Since ctest is just a tool provided by the cmake sources, this change introduces a hidden BR2_PACKAGE_CMAKE symbol which is automatically selected by the BR2_PACKAGE_CMAKE_CTEST one. This is like this mostly for consistency (cmake is the actual package, not ctest). CMake is a particular package: * CMake can be built using the generic infrastructure or the cmake one. Since Buildroot has no requirement regarding the host system cmake program presence, it uses the generic infrastructure to build the host-cmake package, then the (target-)cmake package can be built using the cmake infrastructure; * CMake bundles its dependencies within its sources. This is the reason why the host-cmake package only has host-pkgconf as (runtime) dependency, whereas the (target-)cmake package has a lot of dependencies, using only the system-wide libraries instead of rebuilding and staitcally linking with the ones bundles into the CMake sources. [Thomas: - add missing C++ dependency. - add missing multiple 'select' in Config.in - add missing wchar dependency, inherited from selecting libarchive.] Signed-off-by: Davide Viti <zinosat@tiscali.it> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 10:47:20 +01:00
ctest fails on the target, because it cannot find CMake.cmake inside
CMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake
files are removed at build time via the target-finalize rule.
This buildroot-specific patch makes sure ctest looks also for
"Modules/CMake.cmake.ctest" before complaining
cmake: bump version to 3.6.3 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-04 11:08:37 +01:00
[Vincent: tweak patch for 3.6.3]
package/cmake: make ctest a target package too Useful for packages shipped with a testsuite which makes use of ctest Since ctest is just a tool provided by the cmake sources, this change introduces a hidden BR2_PACKAGE_CMAKE symbol which is automatically selected by the BR2_PACKAGE_CMAKE_CTEST one. This is like this mostly for consistency (cmake is the actual package, not ctest). CMake is a particular package: * CMake can be built using the generic infrastructure or the cmake one. Since Buildroot has no requirement regarding the host system cmake program presence, it uses the generic infrastructure to build the host-cmake package, then the (target-)cmake package can be built using the cmake infrastructure; * CMake bundles its dependencies within its sources. This is the reason why the host-cmake package only has host-pkgconf as (runtime) dependency, whereas the (target-)cmake package has a lot of dependencies, using only the system-wide libraries instead of rebuilding and staitcally linking with the ones bundles into the CMake sources. [Thomas: - add missing C++ dependency. - add missing multiple 'select' in Config.in - add missing wchar dependency, inherited from selecting libarchive.] Signed-off-by: Davide Viti <zinosat@tiscali.it> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 10:47:20 +01:00
Signed-off-by: Davide Viti <zinosat@tiscali.it>
cmake: bump version to 3.6.3 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-04 11:08:37 +01:00
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
package/cmake: make ctest a target package too Useful for packages shipped with a testsuite which makes use of ctest Since ctest is just a tool provided by the cmake sources, this change introduces a hidden BR2_PACKAGE_CMAKE symbol which is automatically selected by the BR2_PACKAGE_CMAKE_CTEST one. This is like this mostly for consistency (cmake is the actual package, not ctest). CMake is a particular package: * CMake can be built using the generic infrastructure or the cmake one. Since Buildroot has no requirement regarding the host system cmake program presence, it uses the generic infrastructure to build the host-cmake package, then the (target-)cmake package can be built using the cmake infrastructure; * CMake bundles its dependencies within its sources. This is the reason why the host-cmake package only has host-pkgconf as (runtime) dependency, whereas the (target-)cmake package has a lot of dependencies, using only the system-wide libraries instead of rebuilding and staitcally linking with the ones bundles into the CMake sources. [Thomas: - add missing C++ dependency. - add missing multiple 'select' in Config.in - add missing wchar dependency, inherited from selecting libarchive.] Signed-off-by: Davide Viti <zinosat@tiscali.it> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 10:47:20 +01:00
cmake: bump version to 3.6.3 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-04 11:08:37 +01:00
diff -rup a/Source/cmake.cxx b/Source/cmake.cxx
--- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100
+++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100
@@ -771,7 +771,12 @@ int cmake::AddCMakePaths()
"Path to cpack program executable.", cmState::INTERNAL);
package/cmake: make ctest a target package too Useful for packages shipped with a testsuite which makes use of ctest Since ctest is just a tool provided by the cmake sources, this change introduces a hidden BR2_PACKAGE_CMAKE symbol which is automatically selected by the BR2_PACKAGE_CMAKE_CTEST one. This is like this mostly for consistency (cmake is the actual package, not ctest). CMake is a particular package: * CMake can be built using the generic infrastructure or the cmake one. Since Buildroot has no requirement regarding the host system cmake program presence, it uses the generic infrastructure to build the host-cmake package, then the (target-)cmake package can be built using the cmake infrastructure; * CMake bundles its dependencies within its sources. This is the reason why the host-cmake package only has host-pkgconf as (runtime) dependency, whereas the (target-)cmake package has a lot of dependencies, using only the system-wide libraries instead of rebuilding and staitcally linking with the ones bundles into the CMake sources. [Thomas: - add missing C++ dependency. - add missing multiple 'select' in Config.in - add missing wchar dependency, inherited from selecting libarchive.] Signed-off-by: Davide Viti <zinosat@tiscali.it> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 10:47:20 +01:00
#endif
cmake: bump version to 3.6.3 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-04 11:08:37 +01:00
if (!cmSystemTools::FileExists(
- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) {
+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) &&
+ !cmSystemTools::FileExists(
+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str()
+ )
package/cmake: make ctest a target package too Useful for packages shipped with a testsuite which makes use of ctest Since ctest is just a tool provided by the cmake sources, this change introduces a hidden BR2_PACKAGE_CMAKE symbol which is automatically selected by the BR2_PACKAGE_CMAKE_CTEST one. This is like this mostly for consistency (cmake is the actual package, not ctest). CMake is a particular package: * CMake can be built using the generic infrastructure or the cmake one. Since Buildroot has no requirement regarding the host system cmake program presence, it uses the generic infrastructure to build the host-cmake package, then the (target-)cmake package can be built using the cmake infrastructure; * CMake bundles its dependencies within its sources. This is the reason why the host-cmake package only has host-pkgconf as (runtime) dependency, whereas the (target-)cmake package has a lot of dependencies, using only the system-wide libraries instead of rebuilding and staitcally linking with the ones bundles into the CMake sources. [Thomas: - add missing C++ dependency. - add missing multiple 'select' in Config.in - add missing wchar dependency, inherited from selecting libarchive.] Signed-off-by: Davide Viti <zinosat@tiscali.it> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 10:47:20 +01:00
+ )
cmake: bump version to 3.6.3 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-04 11:08:37 +01:00
+ {
package/cmake: make ctest a target package too Useful for packages shipped with a testsuite which makes use of ctest Since ctest is just a tool provided by the cmake sources, this change introduces a hidden BR2_PACKAGE_CMAKE symbol which is automatically selected by the BR2_PACKAGE_CMAKE_CTEST one. This is like this mostly for consistency (cmake is the actual package, not ctest). CMake is a particular package: * CMake can be built using the generic infrastructure or the cmake one. Since Buildroot has no requirement regarding the host system cmake program presence, it uses the generic infrastructure to build the host-cmake package, then the (target-)cmake package can be built using the cmake infrastructure; * CMake bundles its dependencies within its sources. This is the reason why the host-cmake package only has host-pkgconf as (runtime) dependency, whereas the (target-)cmake package has a lot of dependencies, using only the system-wide libraries instead of rebuilding and staitcally linking with the ones bundles into the CMake sources. [Thomas: - add missing C++ dependency. - add missing multiple 'select' in Config.in - add missing wchar dependency, inherited from selecting libarchive.] Signed-off-by: Davide Viti <zinosat@tiscali.it> Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 10:47:20 +01:00
// couldn't find modules
cmake: bump version to 3.6.3 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-11-04 11:08:37 +01:00
cmSystemTools::Error(
"Could not find CMAKE_ROOT !!!\n"
Reference in New Issue Copy Permalink