update cmake, fix cmake config file

mk/pkg-bottom.mk

@@ -64,10 +64,10 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),)
 		-e "s#@@TARGET_CFLAGS@@#$(TARGET_CFLAGS)#" \
 		-e "s#@@TARGET_CXXFLAGS@@#$(TARGET_CXXFLAGS)#" \
 		-e "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" \
-		-e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" \
+		-e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \
 		$(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake
 	(cd ${WRKBUILD} && PATH='${HOST_PATH}' \
-		cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		cmake VERBOSE=1 -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 			-DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \
 			${CMAKE_FLAGS} ${WRKSRC})
 else ifneq ($(filter minimal,${CONFIG_STYLE}),)

package/cmake/Makefile

@@ -4,7 +4,7 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		cmake
-PKG_VERSION:=		3.0.0
+PKG_VERSION:=		3.0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		21a1c85e1a3b803c4b48e7ff915a863e
 PKG_DESCR:=		cmake utility

scripts/toolchain.cmake.in

@@ -5,9 +5,10 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "OpenADK CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "OpenADK CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)
-set(CMAKE_PROGRAM_PATH \"@@STAGING_HOST_DIR@@/usr/bin\")
-set(CMAKE_FIND_ROOT_PATH \"@@STAGING_TARGET_DIR@@\")
+set(CMAKE_PROGRAM_PATH "@@STAGING_HOST_DIR@@/usr/bin")
+set(CMAKE_FIND_ROOT_PATH "@@STAGING_TARGET_DIR@@")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(ENV{PKG_CONFIG_SYSROOT_DIR} \"@@STAGING_TARGET_DIR@@\")
+set(ENV{PKG_CONFIG_SYSROOT_DIR} "@@STAGING_TARGET_DIR@@")
+set(ENV{PKG_CONFIG_LIBDIR} "@@STAGING_TARGET_DIR@@/usr/lib/pkgconfig:@@STAGING_TARGET_DIR@@/usr/share/pkgconfig")