diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-06-27 11:22:48 -0400 |
|---|---|---|
| committer | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2015-01-06 11:17:16 +0100 |
| commit | ffd8a5f251fcd6b9af9b299f9bae682de9a3018c (patch) | |
| tree | 1399af9921b897f1e49ce75566f6fa6fbc30cd8c | |
| parent | 9116bfa2305268a561d170bbd87f72aa3dec42a7 (diff) | |
| download | cmake-ffd8a5f251fcd6b9af9b299f9bae682de9a3018c.tar.gz cmake-ffd8a5f251fcd6b9af9b299f9bae682de9a3018c.tar.bz2 cmake-ffd8a5f251fcd6b9af9b299f9bae682de9a3018c.zip | |
add new module for Tizen related directories
| -rw-r--r-- | packaging/TizenCommon.cmake | 36 | ||||
| -rw-r--r-- | packaging/cmake.changes | 5 | ||||
| -rw-r--r-- | packaging/cmake.spec | 5 |
3 files changed, 44 insertions, 2 deletions
diff --git a/packaging/TizenCommon.cmake b/packaging/TizenCommon.cmake new file mode 100644 index 000000000..2a8378557 --- /dev/null +++ b/packaging/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/packaging/cmake.changes b/packaging/cmake.changes index 6496fd290..5ff75f8e3 100644 --- a/packaging/cmake.changes +++ b/packaging/cmake.changes @@ -1,5 +1,10 @@ +<<<<<<< HEAD * Fri Jun 14 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130509.173457@d984652 - Require ncurses-devel for building, not pkgconfig(ncurses) +======= +* Thu Jun 27 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130509.173457@1c276c3 +- add new module for Tizen related directories +>>>>>>> 1f13767... add new module for Tizen related directories * Wed Feb 13 2013 Anas Nashif <anas.nashif@intel.com> upstream/2.8.10.2@260abb7 - Update to 2.8.10.2 diff --git a/packaging/cmake.spec b/packaging/cmake.spec index cb301e6ae..d9905ca28 100644 --- a/packaging/cmake.spec +++ b/packaging/cmake.spec @@ -7,6 +7,7 @@ Url: http://www.cmake.org Group: Platfrom Development/Tools Source0: http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz Source1: macros.cmake +Source2: TizenCommon.cmake BuildRequires: fdupes BuildRequires: expat-devel BuildRequires: pkgconfig(libarchive) >= 2.8.0 @@ -45,7 +46,7 @@ make VERBOSE=1 %{?_smp_mflags} %make_install mkdir -p %{buildroot}%{_libdir}/cmake find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644 -cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog +cp %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/Modules # Install cmake rpm macros install -D -p -m 0644 %{S:1} \ @@ -64,4 +65,4 @@ fdupes %buildroot/usr/share/cmake %{_bindir}/cmake %{_bindir}/cpack %{_bindir}/ctest -%{_datadir}/%{name}/* +%{_datadir}/%{name} |