From e90ae85065b60df3f88f4187ebe4d545c9b53973 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 20 Jun 2014 15:09:19 +0200 Subject: [PATCH] meta-tizen: Fix cmake Change-Id: Ieafa2574e680b290b2d551d81a7b094450ffe45e (From meta-tizen rev: aa00b7c9aedb0aca29a7801f8e3d4e16835e0fda) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../cmake/cmake-native_2.8.12.2.bbappend | 7 +++++ .../recipes-devtools/cmake/cmake_2.8.12.2.bbappend | 7 +++++ .../recipes-devtools/cmake/files/TizenCommon.cmake | 36 ++++++++++++++++++++++ .../slp-pkgmgr/slp-pkgmgr-extraconf.inc | 29 ++++------------- ...ove-including-of-TizenCommon-in-CMakeList.patch | 12 -------- 5 files changed, 56 insertions(+), 35 deletions(-) create mode 100644 meta-tizen/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend create mode 100644 meta-tizen/recipes-devtools/cmake/cmake_2.8.12.2.bbappend create mode 100644 meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake delete mode 100644 meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr/001-Remove-including-of-TizenCommon-in-CMakeList.patch diff --git a/meta-tizen/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend b/meta-tizen/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend new file mode 100644 index 0000000..ebec5e8 --- /dev/null +++ b/meta-tizen/recipes-devtools/cmake/cmake-native_2.8.12.2.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_append := "${THISDIR}/files" + +SRC_URI += "file://TizenCommon.cmake" + +do_install_append() { + install -m 644 ${WORKDIR}/TizenCommon.cmake ${D}${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Modules +} \ No newline at end of file diff --git a/meta-tizen/recipes-devtools/cmake/cmake_2.8.12.2.bbappend b/meta-tizen/recipes-devtools/cmake/cmake_2.8.12.2.bbappend new file mode 100644 index 0000000..ebec5e8 --- /dev/null +++ b/meta-tizen/recipes-devtools/cmake/cmake_2.8.12.2.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_append := "${THISDIR}/files" + +SRC_URI += "file://TizenCommon.cmake" + +do_install_append() { + install -m 644 ${WORKDIR}/TizenCommon.cmake ${D}${datadir}/cmake-${CMAKE_MAJOR_VERSION}/Modules +} \ No newline at end of file diff --git a/meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake b/meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake new file mode 100644 index 0000000..2a83785 --- /dev/null +++ b/meta-tizen/recipes-devtools/cmake/files/TizenCommon.cmake @@ -0,0 +1,36 @@ +# Copied from libzypp +# Library +IF ( DEFINED LIB ) + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB}" ) +ELSE ( DEFINED LIB ) + IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET( LIB_SUFFIX "64" ) + ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) +ENDIF ( DEFINED LIB ) +MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) + +# system configuration dir (etc) +IF( NOT DEFINED SYSCONFDIR ) + IF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" ) + # if installing in usr, set sysconfg to etc + SET( SYSCONFDIR /etc ) + ELSE ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" ) + SET ( SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" ) + ENDIF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" ) +ENDIF( NOT DEFINED SYSCONFDIR ) +MESSAGE(STATUS "Config files will be installed in ${SYSCONFDIR}" ) + +# usr INSTALL_PREFIX + +IF( DEFINED CMAKE_INSTALL_PREFIX ) + SET( INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) +ELSE( DEFINED CMAKE_INSTALL_PREFIX ) + SET( INSTALL_PREFIX /usr ) +ENDIF( DEFINED CMAKE_INSTALL_PREFIX ) + +# system configuration dir (etc) +IF( NOT DEFINED MANDIR ) + SET( MANDIR ${INSTALL_PREFIX}/share/man ) +ENDIF( NOT DEFINED MANDIR ) +MESSAGE( "** Manual files will be installed in ${MANDIR}" ) diff --git a/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc b/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc index 98dc762..b95d6a2 100644 --- a/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc +++ b/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr-extraconf.inc @@ -1,25 +1,8 @@ -SRC_URI="file://001-Remove-including-of-TizenCommon-in-CMakeList.patch" +#inherit cmake + +#B = "${S}" + + + -pkgmgr_files += "/package-manager" -pkgmgr_files += "/package-manager/pkg_path.conf" -pkgmgr_files += "/opt" -pkgmgr_files += "/usr/share/dbus-1" -pkgmgr_files += "/usr/share/dbus-1/system-services" -pkgmgr_files += "/usr/share/dbus-1/system-services/org.tizen.slp.pkgmgr.service" -pkgmgr_files += "/usr/lib/libpkgmgr_installer_client.so.0.1.0" -pkgmgr_files += "/usr/lib/libpkgmgr_installer.so.0.1.0" -pkgmgr_files += "/usr/lib/libpkgmgr-client.so.0.1.68" -pkgmgr_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so.0" -pkgmgr_files += "/usr/lib/libpkgmgr_installer.so.0" -pkgmgr_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so.0.1.0" -pkgmgr_files += "/usr/lib/libpkgmgr_installer_client.so.0" -pkgmgr_files += "/usr/lib/libpkgmgr-client.so.0" -pkgmgr_files += "/opt/upgrade" -pkgmgr_files += "/opt/upgrade/pkgmgr.patch.sh" -pkgmgr_files += "/etc/package-manager/server" -pkgmgr_files += "/dbus-1/system.d" -pkgmgr_files += "/dbus-1/system.d/org.tizen.slp.pkgmgr.conf" -pkgmgr_files += "/package-manager/server" -pkgmgr_files += "/package-manager/queue_status" -pkgmgr_files += "/usr/bin/pkgmgr-server" diff --git a/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr/001-Remove-including-of-TizenCommon-in-CMakeList.patch b/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr/001-Remove-including-of-TizenCommon-in-CMakeList.patch deleted file mode 100644 index ba86ec3..0000000 --- a/meta-tizen/recipes-tizen/slp-pkgmgr/slp-pkgmgr/001-Remove-including-of-TizenCommon-in-CMakeList.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89bc993..053de5e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - - PROJECT(package-manager C) --INCLUDE(TizenCommon) - - SET(VERSION 0.1.68) - SET(VERSION_MAJOR 0) -- 2.7.4