From f5efb45643981b67e5080b3c5daca903a3fb5410 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Thu, 20 Oct 2016 16:48:40 +0900 Subject: [PATCH] Fix CMakeLists to add files automatically Change-Id: I2faad2319548ee0c2bcd04490c37d384924cd386 Signed-off-by: Junghyun Yeon --- client/CMakeLists.txt | 7 ++----- packaging/pkgmgr.spec | 5 ++--- types/CMakeLists.txt | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 0076596..ab19c7b 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,9 +1,6 @@ # package manager client library -SET(SRCS - src/pkgmgr.c - src/pkgmgr_client_connection.c - src/pkgmgr_client_internal.c) +AUX_SOURCE_DIRECTORY(src SRCS) pkg_check_modules(CLIENT_DEPS REQUIRED glib-2.0 @@ -33,6 +30,6 @@ CONFIGURE_FILE(pkgmgr.pc.in pkgmgr.pc @ONLY) CONFIGURE_FILE(pkg_path.conf.in pkg_path.conf @ONLY) INSTALL(TARGETS ${PKGMGR_CLIENT} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager.h DESTINATION include) +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkg_path.conf DESTINATION ${SYSCONFDIR}/package-manager/) diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec index c8870c5..adf1725 100644 --- a/packaging/pkgmgr.spec +++ b/packaging/pkgmgr.spec @@ -161,7 +161,7 @@ HOME="$saveHOME" %files client-devel %manifest %{name}-client-devel.manifest %defattr(-,root,root,-) -%{_includedir}/package-manager.h +%{_includedir}/*.h %{_libdir}/pkgconfig/pkgmgr.pc %{_libdir}/libpkgmgr-client.so @@ -185,6 +185,5 @@ HOME="$saveHOME" %files types-devel %manifest %{name}-types-devel.manifest %defattr(-,root,root,-) -%{_includedir}/package-manager-types.h -%{_includedir}/package-manager-plugin.h +%{_includedir}/package-manager-*.h %{_libdir}/pkgconfig/pkgmgr-types.pc diff --git a/types/CMakeLists.txt b/types/CMakeLists.txt index 56a9dcf..dff17b3 100644 --- a/types/CMakeLists.txt +++ b/types/CMakeLists.txt @@ -1,7 +1,7 @@ CONFIGURE_FILE(pkgmgr-types.pc.in ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-types.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager-types.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager-plugin.h - DESTINATION include) +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include + FILES_MATCHING + PATTERN "*.h") INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-types.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -- 2.34.1