CMake package and infra improvements

index 1bce00a..cc494a7 100644
@@ -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

new file mode 100644
index 0000000..915b7e3
@@ -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 <[email protected]>
+
+--- 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"

new file mode 100644
index 0000000..3d31d7a
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_CMAKE
+	bool
+
+config BR2_PACKAGE_CMAKE_CTEST
+	bool "ctest"
+	select BR2_PACKAGE_CMAKE
+	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/

index a00b8cd..9a939bf 100644
@@ -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))

new file mode 100644
index 0000000..37ade11
@@ -0,0 +1,231 @@
+From e727eebf04883c6af4a6d4584e33989c204b9b8f Mon Sep 17 00:00:00 2001
+From: Samuel Martin <[email protected]>
+Date: Sun, 25 Jan 2015 18:11:13 +0100
+Subject: [PATCH] CMake: allow to select what program to be built
+
+Signed-off-by: Samuel Martin <[email protected]>
+---
+ CMakeLists.txt        | 24 ++++++++++++++++++++++++
+ Source/CMakeLists.txt | 33 ++++++++++++++++++++++++++++++++-
+ 2 files changed, 56 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 71850de..cb9375e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,6 +43,16 @@ if(CMAKE_ENCODING_UTF8)
+   set(KWSYS_ENCODING_DEFAULT_CODEPAGE CP_UTF8)
+ endif()
+ 
++# options to select what programs to be built
++option(BUILD_CMAKE "Build cmake program" ON)
++mark_as_advanced(BUILD_CMAKE)
++
++option(BUILD_CTEST "Build ctest program" ON)
++mark_as_advanced(BUILD_CTEST)
++
++option(BUILD_CPACK "Build cpack program" ON)
++mark_as_advanced(BUILD_CPACK)
++
+ #-----------------------------------------------------------------------
+ # a macro to deal with system libraries, implemented as a macro
+ # simply to improve readability of the main script
+@@ -241,6 +251,7 @@ macro (CMAKE_BUILD_UTILITIES)
+ 
+   #---------------------------------------------------------------------
+   # Build zlib library for Curl, CMake, and CTest.
++  if(BUILD_CMAKE OR BUILD_CTEST OR NOT CMAKE_USE_SYSTEM_CURL)
+   set(CMAKE_ZLIB_HEADER "cm_zlib.h")
+   if(CMAKE_USE_SYSTEM_ZLIB)
+     find_package(ZLIB)
+@@ -256,9 +267,11 @@ macro (CMAKE_BUILD_UTILITIES)
+     add_subdirectory(Utilities/cmzlib)
+     CMAKE_SET_TARGET_FOLDER(cmzlib "Utilities/3rdParty")
+   endif()
++  endif()
+ 
+   #---------------------------------------------------------------------
+   # Build Curl library for CTest.
++  if(BUILD_CMAKE OR BUILD_CTEST)
+   if(CMAKE_USE_SYSTEM_CURL)
+     find_package(CURL)
+     if(NOT CURL_FOUND)
+@@ -284,9 +297,11 @@ macro (CMAKE_BUILD_UTILITIES)
+     CMAKE_SET_TARGET_FOLDER(cmcurl "Utilities/3rdParty")
+     CMAKE_SET_TARGET_FOLDER(LIBCURL "Utilities/3rdParty")
+   endif()
++  endif()
+ 
+   #---------------------------------------------------------------------
+   # Build Compress library for CTest.
++  if(BUILD_CMAKE OR BUILD_CTEST)
+   set(CMAKE_COMPRESS_INCLUDES
+     "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress")
+   set(CMAKE_COMPRESS_LIBRARIES "cmcompress")
+@@ -301,6 +316,7 @@ macro (CMAKE_BUILD_UTILITIES)
+     add_subdirectory(Utilities/cmbzip2)
+     CMAKE_SET_TARGET_FOLDER(cmbzip2 "Utilities/3rdParty")
+   endif()
++  endif()
+ 
+   #---------------------------------------------------------------------
+   # Build or use system liblzma for libarchive.
+@@ -321,6 +337,7 @@ macro (CMAKE_BUILD_UTILITIES)
+ 
+   #---------------------------------------------------------------------
+   # Build or use system libarchive for CMake and CTest.
++  if(BUILD_CMAKE OR BUILD_CTEST)
+   if(CMAKE_USE_SYSTEM_LIBARCHIVE)
+     find_package(LibArchive)
+     if(NOT LibArchive_FOUND)
+@@ -347,9 +364,11 @@ macro (CMAKE_BUILD_UTILITIES)
+     CMAKE_SET_TARGET_FOLDER(cmlibarchive "Utilities/3rdParty")
+     set(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})
+   endif()
++  endif()
+ 
+   #---------------------------------------------------------------------
+   # Build expat library for CMake and CTest.
++  if(BUILD_CMAKE OR BUILD_CTEST)
+   if(CMAKE_USE_SYSTEM_EXPAT)
+     find_package(EXPAT)
+     if(NOT EXPAT_FOUND)
+@@ -364,9 +383,11 @@ macro (CMAKE_BUILD_UTILITIES)
+     add_subdirectory(Utilities/cmexpat)
+     CMAKE_SET_TARGET_FOLDER(cmexpat "Utilities/3rdParty")
+   endif()
++  endif()
+ 
+   #---------------------------------------------------------------------
+   # Build XMLRPC library for CMake and CTest.
++  if(BUILD_CMAKE OR BUILD_CTEST)
+   if(CTEST_USE_XMLRPC)
+     find_package(XMLRPC QUIET REQUIRED libwww-client)
+     if(NOT XMLRPC_FOUND)
+@@ -376,6 +397,7 @@ macro (CMAKE_BUILD_UTILITIES)
+     set(CMAKE_XMLRPC_INCLUDES ${XMLRPC_INCLUDE_DIRS})
+     set(CMAKE_XMLRPC_LIBRARIES ${XMLRPC_LIBRARIES})
+   endif()
++  endif()
+ 
+   #---------------------------------------------------------------------
+   # Use curses?
+@@ -583,7 +605,9 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+   add_subdirectory(Utilities)
+ endif()
+ 
++if(BUILD_CTEST)
+ add_subdirectory(Tests)
++endif()
+ 
+ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+   if(BUILD_TESTING)
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
+index 1ff1c16..d0145af 100644
+--- a/Source/CMakeLists.txt
++++ b/Source/CMakeLists.txt
+@@ -482,6 +482,7 @@ if(WIN32 AND NOT CYGWIN AND NOT BORLAND)
+ endif()
+ 
+ # create a library used by the command line and the GUI
++if(BUILD_CMAKE OR BUILD_CTEST OR BUILD_CPACK)
+ add_library(CMakeLib ${SRCS})
+ target_link_libraries(CMakeLib cmsys
+   ${CMAKE_EXPAT_LIBRARIES} ${CMAKE_ZLIB_LIBRARIES}
+@@ -497,6 +498,7 @@ endif()
+ if(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
+   target_link_libraries(CMakeLib rpcrt4)
+ endif()
++endif()
+ 
+ #
+ # CTestLib
+@@ -566,8 +568,10 @@ set(CTEST_SRCS cmCTest.cxx
+   )
+ 
+ # Build CTestLib
++if(BUILD_CTEST)
+ add_library(CTestLib ${CTEST_SRCS})
+ target_link_libraries(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})
++endif()
+ 
+ #
+ # Sources for CPack
+@@ -629,9 +633,12 @@ if(APPLE)
+ endif()
+ 
+ # Build CPackLib
++if(BUILD_CPACK)
+ add_library(CPackLib ${CPACK_SRCS})
+ target_link_libraries(CPackLib CMakeLib)
++endif()
+ 
++if(BUILD_CMAKE)
+ if(APPLE)
+   add_executable(cmakexbuild cmakexbuild.cxx)
+   target_link_libraries(cmakexbuild CMakeLib)
+@@ -640,36 +647,60 @@ if(APPLE)
+   target_link_libraries(OSXScriptLauncher cmsys)
+   target_link_libraries(OSXScriptLauncher "-framework CoreFoundation")
+ endif()
++endif()
+ 
+ # Build CMake executable
++if(BUILD_CMAKE)
+ add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h)
+ target_link_libraries(cmake CMakeLib)
++endif()
+ 
+ # Build CTest executable
++if(BUILD_CTEST)
+ add_executable(ctest ctest.cxx)
+ target_link_libraries(ctest CTestLib)
++endif()
+ 
+ # Build CPack executable
++if(BUILD_CPACK)
+ add_executable(cpack CPack/cpack.cxx)
+ target_link_libraries(cpack CPackLib)
++endif()
+ 
+ # Curses GUI
++if(BUILD_CMAKE)
+ if(BUILD_CursesDialog)
+   include(${CMake_SOURCE_DIR}/Source/CursesDialog/CMakeLists.txt)
+ endif()
++endif()
+ 
+ # Qt GUI
+ option(BUILD_QtDialog "Build Qt dialog for CMake" FALSE)
++if(BUILD_CMAKE)
+ if(BUILD_QtDialog)
+   add_subdirectory(QtDialog)
+ endif()
++endif()
+ 
+ include (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
+ include (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL)
+ 
+-install(TARGETS cmake ctest cpack DESTINATION bin)
++if(BUILD_CMAKE)
++install(TARGETS cmake DESTINATION bin)
++endif()
++
++if(BUILD_CTEST)
++install(TARGETS ctest DESTINATION bin)
++endif()
++
++if(BUILD_CPACK)
++install(TARGETS cpack DESTINATION bin)
++endif()
++
++if(BUILD_CMAKE)
+ if(APPLE)
+   install(TARGETS cmakexbuild DESTINATION bin)
+ endif()
++endif()
+ 
+ install(FILES cmCPluginAPI.h DESTINATION ${CMAKE_DATA_DIR}/include)
+-- 
+2.3.1
+

index 9a939bf..7e67c31 100644
@@ -18,7 +18,10 @@ CMAKE_CONF_OPTS = \
 	-DKWSYS_CHAR_IS_SIGNED=TRUE \
 	-DCMAKE_USE_SYSTEM_LIBRARIES=1 \
 	-DCTEST_USE_XMLRPC=OFF \
-	-DBUILD_CursesDialog=OFF
+	-DBUILD_CursesDialog=OFF \
+	-DBUILD_CMAKE=OFF \
+	-DBUILD_CTEST=ON \
+	-DBUILD_CPACK=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

@@ -36,6 +39,10 @@ define HOST_CMAKE_CONFIGURE_CMDS
 			-DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \
 			-DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \
 			-DBUILD_CursesDialog=OFF \
+			-DBUILD_CMAKE=ON \
+			-DBUILD_CTEST=OFF \
+			-DBUILD_CPACK=OFF \
+			-DBUILD_TESTING=OFF \
 	)
 endef
 

@@ -48,7 +55,6 @@ define HOST_CMAKE_INSTALL_CMDS
 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

index 816af13..cd41254 100644
@@ -21,6 +21,7 @@ set(CMAKE_INSTALL_SO_NO_EXE 0)
 set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin")
 set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")

index 2404c40..c6b9eff 100644
@@ -231,6 +231,7 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
 	@mkdir -p $(@D)
 	sed \
 		-e 's:@@STAGING_SUBDIR@@:$(call qstrip,$(STAGING_SUBDIR)):' \
+		-e 's:@@TARGET_HAS_LIBSTDCXX@@:$(if $(BR2_INSTALL_LIBSTDCPP),TRUE,FALSE):' \
 		-e 's:@@TARGET_CFLAGS@@:$(call qstrip,$(TARGET_CFLAGS)):' \
 		-e 's:@@TARGET_CXXFLAGS@@:$(call qstrip,$(TARGET_CXXFLAGS)):' \
 		-e 's:@@TARGET_LDFLAGS@@:$(call qstrip,$(TARGET_LDFLAGS)):' \

index cd41254..395cf3f 100644
@@ -17,6 +17,7 @@ set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot C
 set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS")
 set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@ ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot LDFLAGS")
 set(CMAKE_INSTALL_SO_NO_EXE 0)
+set(TARGET_HAS_LIBSTDCXX @@TARGET_HAS_LIBSTDCXX@@)
 
 set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin")
 set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")

@@ -35,25 +36,45 @@ if(DEFINED USE_CCACHE)
 	if(USE_CCACHE)
 		set(CMAKE_ASM_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC_NOCCACHE@@")
 		set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/usr/bin/ccache")
-		set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/usr/bin/ccache")
 		set(CMAKE_C_COMPILER_ARG1 "${RELOCATED_HOST_DIR}/@@TARGET_CC_NOCCACHE@@")
-		set(CMAKE_CXX_COMPILER_ARG1 "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		if(TARGET_HAS_LIBSTDCXX)
+			set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/usr/bin/ccache")
+			set(CMAKE_CXX_COMPILER_ARG1 "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		else()
+			message(STATUS "Disabling C++ compiler because libstdc++ is not installed in the target filsystem")
+			set(CMAKE_CXX_COMPILER "CMAKE_CXX_COMPILER-NOTFOUND")
+		endif()
 	else()
 		set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC_NOCCACHE@@")
-		set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		if(TARGET_HAS_LIBSTDCXX)
+			set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		else()
+			message(STATUS "Disabling C++ compiler because libstdc++ is not installed in the target filsystem")
+			set(CMAKE_CXX_COMPILER "CMAKE_CXX_COMPILER-NOTFOUND")
+		endif()
 	endif()
 else()
 	find_program(CCACHE ccache HINTS "${RELOCATED_HOST_DIR}/usr/bin")
 	if(CCACHE)
 		set(CMAKE_ASM_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC_NOCCACHE@@")
 		set(CMAKE_C_COMPILER "${CCACHE}")
-		set(CMAKE_CXX_COMPILER "${CCACHE}")
 		set(CMAKE_C_COMPILER_ARG1 "${RELOCATED_HOST_DIR}/@@TARGET_CC_NOCCACHE@@")
-		set(CMAKE_CXX_COMPILER_ARG1 "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		if(TARGET_HAS_LIBSTDCXX)
+			set(CMAKE_CXX_COMPILER "${CCACHE}")
+			set(CMAKE_CXX_COMPILER_ARG1 "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		else()
+			message(STATUS "Disabling C++ compiler because libstdc++ is not installed in the target filsystem")
+			set(CMAKE_CXX_COMPILER "CMAKE_CXX_COMPILER-NOTFOUND")
+		endif()
 		message(STATUS "ccache program has been found and will be used for the build.")
 		message(STATUS "  To disable ccache, add -DUSE_CCACHE=OFF on the cmake command line.")
 	else()
 		set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC_NOCCACHE@@")
-		set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		if(TARGET_HAS_LIBSTDCXX)
+			set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX_NOCCACHE@@")
+		else()
+			message(STATUS "Disabling C++ compiler because libstdc++ is not installed in the target filsystem")
+			set(CMAKE_CXX_COMPILER "CMAKE_CXX_COMPILER-NOTFOUND")
+		endif()
 	endif()
 endif()