mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-09 17:03:35 -09:00
1148619156
https://cmake.org/cmake/help/v4.3/release/4.3.html
Added Upstream: tag and rebased patch 0001.
Updated license hash due to copyright year bump:
97ad58a86c
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 68d3b1dfbbd2f54bf81986d1d733deaf66658b15 Mon Sep 17 00:00:00 2001
|
|
From: Davide Viti <zinosat@tiscali.it>
|
|
Date: Thu, 14 Jul 2016 10:14:59 +0100
|
|
Subject: [PATCH] rename cmake rootfile
|
|
|
|
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
|
|
|
|
Upstream: N/A (specific to buildroot)
|
|
|
|
[Vincent: tweak patch for 3.6.3]
|
|
[James: tweak patch for 3.15.4]
|
|
[Bernd: rebased for 4.3.0]
|
|
|
|
Signed-off-by: Davide Viti <zinosat@tiscali.it>
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
Source/cmake.cxx | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
|
|
index 3772f09985..c317e4af38 100644
|
|
--- a/Source/cmake.cxx
|
|
+++ b/Source/cmake.cxx
|
|
@@ -1987,7 +1987,12 @@ int cmake::AddCMakePaths()
|
|
cmStateEnums::INTERNAL);
|
|
#endif
|
|
if (!cmSystemTools::FileExists(
|
|
- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake"))) {
|
|
+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake")) &&
|
|
+ !cmSystemTools::FileExists(
|
|
+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest")
|
|
+ )
|
|
+ )
|
|
+ {
|
|
// couldn't find modules
|
|
cmSystemTools::Error(
|
|
cmStrCat("Could not find CMAKE_ROOT !!!\n"
|
|
--
|
|
2.20.1
|
|
|