[poky] [PULL][PATCH 1/1] cmake: remove version in directory structure

[Maxime Roussin-Bélanger]

Remove the number because I don't think it's worth
supporting multiple version of cmake inside an embedded
product.

When using an SDK, using 2 different CMake is probably not a
use case.

Signed-off-by: Maxime Roussin-Bélanger <roussinm at sonatest.com>
---
 meta/recipes-devtools/cmake/cmake-native_3.12.2.bb | 2 ++
 meta/recipes-devtools/cmake/cmake_3.12.2.bb        | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb
index 9a1390f96d..3e59012b48 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb
@@ -16,6 +16,8 @@ do_configure[cleandirs] = "${B}"
 # Disable ccmake since we don't depend on ncurses
 CMAKE_EXTRACONF = "\
     -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
+    -DCMAKE_DOC_DIR=doc/cmake \
+    -DCMAKE_DATA_DIR=share/cmake \
     -DBUILD_CursesDialog=0 \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
diff --git a/meta/recipes-devtools/cmake/cmake_3.12.2.bb b/meta/recipes-devtools/cmake/cmake_3.12.2.bb
index e0457677e8..0a3963b525 100644
--- a/meta/recipes-devtools/cmake/cmake_3.12.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.12.2.bb
@@ -26,7 +26,8 @@ python () {
 }
 
 EXTRA_OECMAKE=" \
-    -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
+    -DCMAKE_DOC_DIR=${docdir_stripped}/cmake \
+    -DCMAKE_DATA_DIR=share/cmake \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
@@ -46,8 +47,8 @@ do_install_append_class-nativesdk() {
 
 FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}"
 
-FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION} ${datadir}/cmake ${datadir}/aclocal"
-FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
+FILES_${PN} += "${datadir}/cmake ${datadir}/aclocal"
+FILES_${PN}-doc += "${docdir}/cmake"
 FILES_${PN}-dev = ""
 
 BBCLASSEXTEND = "nativesdk"
-- 
2.19.2