From 7b17bafc5d7948aff3059e058ada80ad1fc50500 Mon Sep 17 00:00:00 2001 From: Davide Viti Date: Sun, 8 Mar 2015 10:47:20 +0100 Subject: [PATCH] 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 Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + .../cmake/0001-rename_cmake_rootfile.patch | 23 ++++++++++++++ package/cmake/Config.in | 25 ++++++++++++++++ package/cmake/cmake.mk | 30 +++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 package/cmake/0001-rename_cmake_rootfile.patch create mode 100644 package/cmake/Config.in diff --git a/package/Config.in b/package/Config.in index 95618dbf2a..3d8c213e20 100644 --- a/package/Config.in +++ b/package/Config.in @@ -105,6 +105,7 @@ menu "Development tools" source "package/binutils/Config.in" source "package/bsdiff/Config.in" source "package/bustle/Config.in" + source "package/cmake/Config.in" source "package/cppunit/Config.in" source "package/cvs/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package/cmake/0001-rename_cmake_rootfile.patch b/package/cmake/0001-rename_cmake_rootfile.patch new file mode 100644 index 0000000000..915b7e32bb --- /dev/null +++ b/package/cmake/0001-rename_cmake_rootfile.patch @@ -0,0 +1,23 @@ +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 + +Signed-off-by: Davide Viti + +--- cmake-3.0.2/Source/cmake.cxx~ 2014-09-11 15:24:01.000000000 +0200 ++++ cmake-3.0.2/Source/cmake.cxx 2014-11-25 15:48:04.461033690 +0100 +@@ -957,7 +957,10 @@ + "Path to cpack program executable.", cmCacheManager::INTERNAL); + #endif + 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()) ++ ) + { + // couldn't find modules + cmSystemTools::Error("Could not find CMAKE_ROOT !!!\n" diff --git a/package/cmake/Config.in b/package/cmake/Config.in new file mode 100644 index 0000000000..0b5bba9754 --- /dev/null +++ b/package/cmake/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_CMAKE + bool + +config BR2_PACKAGE_CMAKE_CTEST + bool "ctest" + select BR2_PACKAGE_CMAKE + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBARCHIVE + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_XZ + depends on BR2_USE_WCHAR # libarchive + depends on BR2_INSTALL_LIBSTDCPP + help + CTest is a testing tool distributed as a part of CMake. It + can be used to automate updating (using CVS for example), + configuring, building, testing, performing memory checking, + performing coverage, and submitting results to a CDash or + Dart dashboard system. + + http://www.cmake.org/ + +comment "ctest needs a toolchain w/ C++, wchar" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index a00b8cda6a..9a939bf314 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -11,6 +11,14 @@ CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt HOST_CMAKE_DEPENDENCIES = host-pkgconf +CMAKE_DEPENDENCIES = zlib libcurl libarchive expat bzip2 xz + +CMAKE_CONF_OPTS = \ + -DKWSYS_LFS_WORKS=$(if $(BR2_LARGEFILE),TRUE,FALSE) \ + -DKWSYS_CHAR_IS_SIGNED=TRUE \ + -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ + -DCTEST_USE_XMLRPC=OFF \ + -DBUILD_CursesDialog=OFF # Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a # header available in $(HOST_DIR)/usr/include is used instead of a @@ -39,4 +47,26 @@ define HOST_CMAKE_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install endef +define CMAKE_REMOVE_EXTRA_DATA + rm $(TARGET_DIR)/usr/bin/{cmake,cpack} + rm -fr $(TARGET_DIR)/usr/share/cmake-$(CMAKE_VERSION_MAJOR)/{completions,editors} + rm -fr $(TARGET_DIR)/usr/share/cmake-$(CMAKE_VERSION_MAJOR)/{Help,include} +endef + +define CMAKE_INSTALL_CTEST_CFG_FILE + $(INSTALL) -m 0644 -D $(@D)/Modules/CMake.cmake \ + $(TARGET_DIR)/usr/share/cmake-$(CMAKE_VERSION_MAJOR)/Modules/CMake.cmake.ctest +endef + +CMAKE_POST_INSTALL_TARGET_HOOKS += CMAKE_REMOVE_EXTRA_DATA +CMAKE_POST_INSTALL_TARGET_HOOKS += CMAKE_INSTALL_CTEST_CFG_FILE + +define CMAKE_INSTALL_TARGET_CMDS + (cd $(@D); \ + $(HOST_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ + cmake -P cmake_install.cmake \ + ) +endef + +$(eval $(cmake-package)) $(eval $(host-generic-package)) -- 2.30.2