From a96892f0769bdd242e37f8c0c145780806eb69ec Mon Sep 17 00:00:00 2001 From: hyunho Date: Thu, 10 May 2018 21:27:09 +0900 Subject: [PATCH] Fix devel include path Change-Id: Iab1e7b397c4855c1d4e1ffc271c6b655dcca02d1 Signed-off-by: hyunho --- packaging/libwatchface-complication.spec | 5 +---- watchface-complication-provider/CMakeLists.txt | 11 +++-------- watchface-complication/CMakeLists.txt | 17 ++++------------- watchface-complication/watchface-complication.pc.in | 4 ++-- watchface-editor/CMakeLists.txt | 9 +-------- 5 files changed, 11 insertions(+), 35 deletions(-) diff --git a/packaging/libwatchface-complication.spec b/packaging/libwatchface-complication.spec index 9e11780..87a8d81 100644 --- a/packaging/libwatchface-complication.spec +++ b/packaging/libwatchface-complication.spec @@ -93,8 +93,7 @@ install -m 0644 .complication_provider.db-journal %{buildroot}%{_sysconfdir}/ske %files -n %{name}-devel %{_includedir}/watchface-complication/*.h -%{_includedir}/watchface-complication/include/*.h -%{_includedir}/watchface-common/include/*.h +%{_includedir}/watchface-common/*.h %{_libdir}/pkgconfig/watchface-complication.pc %attr(0644,root,root) %{_libdir}/%{name}.so @@ -137,7 +136,6 @@ chsmack -a 'User::Home' %{TZ_SYS_DB}/.complication_provider.db-journal %files -n %{name}-provider-devel %{_includedir}/watchface-complication-provider/*.h -%{_includedir}/watchface-complication-provider/include/*.h %{_libdir}/pkgconfig/watchface-complication-provider.pc %attr(0644,root,root) %{_libdir}/%{name}-provider.so @@ -170,7 +168,6 @@ Header & package configuration files to support development of the watchface edi %files -n libwatchface-editor-devel %{_includedir}/watchface-editor/*.h -%{_includedir}/watchface-editor/include/*.h %{_libdir}/pkgconfig/watchface-editor.pc %attr(0644,root,root) %{_libdir}/libwatchface-editor.so diff --git a/watchface-complication-provider/CMakeLists.txt b/watchface-complication-provider/CMakeLists.txt index fa7ec1c..7267128 100644 --- a/watchface-complication-provider/CMakeLists.txt +++ b/watchface-complication-provider/CMakeLists.txt @@ -47,11 +47,6 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING - PATTERN "*-internal.h" EXCLUDE - PATTERN "*-implementation.h" EXCLUDE - PATTERN "*.h") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING - PATTERN "*-internal.h" EXCLUDE - PATTERN "*-implementation.h" EXCLUDE - PATTERN "*.h") + +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-complication-provider.h DESTINATION include/${PROJECT_NAME}) + diff --git a/watchface-complication/CMakeLists.txt b/watchface-complication/CMakeLists.txt index e02010e..660a6ef 100644 --- a/watchface-complication/CMakeLists.txt +++ b/watchface-complication/CMakeLists.txt @@ -48,16 +48,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING - PATTERN "*-internal.h" EXCLUDE - PATTERN "*-implementation.h" EXCLUDE - PATTERN "*.h") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING - PATTERN "*-internal.h" EXCLUDE - PATTERN "*-implementation.h" EXCLUDE - PATTERN "*.h") - -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../watchface-common/include DESTINATION include/watchface-common FILES_MATCHING - PATTERN "*-internal.h" EXCLUDE - PATTERN "*-implementation.h" EXCLUDE - PATTERN "*.h") + +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-editable.h DESTINATION include/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-complication.h DESTINATION include/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common/include/watchface-common.h DESTINATION include/watchface-common) \ No newline at end of file diff --git a/watchface-complication/watchface-complication.pc.in b/watchface-complication/watchface-complication.pc.in index c9f9e6a..f4e7d12 100644 --- a/watchface-complication/watchface-complication.pc.in +++ b/watchface-complication/watchface-complication.pc.in @@ -7,5 +7,5 @@ Name: watchface-complication Description: Support development of the watchface complication library Version: @VERSION@ Libs: -L${libdir} -lwatchface-complication -Cflags: -I${includedir} -I${includedir}/../watchface-common/include/ -cppflags: -I${includedir} -I${includedir}/../watchface-common/include/ \ No newline at end of file +Cflags: -I${includedir} -I${includedir}/../watchface-common/ +cppflags: -I${includedir} -I${includedir}/../watchface-common/ \ No newline at end of file diff --git a/watchface-editor/CMakeLists.txt b/watchface-editor/CMakeLists.txt index 2f62fc1..0e85640 100644 --- a/watchface-editor/CMakeLists.txt +++ b/watchface-editor/CMakeLists.txt @@ -43,11 +43,4 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING - PATTERN "*-internal.h" EXCLUDE - PATTERN "*-implementation.h" EXCLUDE - PATTERN "*.h") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING - PATTERN "*-internal.h" EXCLUDE - PATTERN "*-implementation.h" EXCLUDE - PATTERN "*.h") +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-editor.h DESTINATION include/${PROJECT_NAME}) -- 2.7.4