Creates watchface-common RPM 05/189705/2
authorhyunho <hhstark.kang@samsung.com>
Thu, 20 Sep 2018 04:15:20 +0000 (13:15 +0900)
committerHyunho Kang <hhstark.kang@samsung.com>
Thu, 20 Sep 2018 04:18:25 +0000 (04:18 +0000)
For now every RPM include watchface-common sources
it is inefficient, let's make watchface-common RPM

Change-Id: Ie868d3919b5439d44680c49459713e519c1af0a8
Signed-off-by: hyunho <hhstark.kang@samsung.com>
13 files changed:
CMakeLists.txt
packaging/libwatchface-common.manifest [new file with mode: 0644]
packaging/libwatchface-complication.spec
watchface-common/CMakeLists.txt [new file with mode: 0644]
watchface-common/LICENSE [new file with mode: 0644]
watchface-common/watchface-common.pc.in [new file with mode: 0644]
watchface-common/watchface-util.h
watchface-complication-provider/CMakeLists.txt
watchface-complication-provider/watchface-complication-provider.pc.in
watchface-complication/CMakeLists.txt
watchface-complication/watchface-complication.pc.in
watchface-editor/CMakeLists.txt
watchface-editor/watchface-editor.pc.in

index 9796bab..567915f 100644 (file)
@@ -1,11 +1,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+ADD_SUBDIRECTORY(watchface-common)
 ADD_SUBDIRECTORY(watchface-complication-provider)
 ADD_SUBDIRECTORY(watchface-complication)
 ADD_SUBDIRECTORY(watchface-editor)
 ADD_SUBDIRECTORY(parser)
 ADD_SUBDIRECTORY(unittest)
 
+ADD_DEPENDENCIES(watchface-complication watchface-common)
 ADD_DEPENDENCIES(watchface-editor watchface-complication)
 ADD_DEPENDENCIES(watchface-complication-provider watchface-complication)
 ADD_DEPENDENCIES(complication-parser watchface-complication)
diff --git a/packaging/libwatchface-common.manifest b/packaging/libwatchface-common.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>
index a607a0e..a2847cb 100644 (file)
@@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 Source1002: %{name}-provider.manifest
 Source1003: libwatchface-editor.manifest
+Source1004: libwatchface-common.manifest
 BuildRequires: cmake
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(glib-2.0)
@@ -33,6 +34,7 @@ BuildRequires: lcov
 %endif
 Requires: amd-mod-complication
 Requires: %{name}-provider
+Requires: libwatchface-common
 
 %description
 API for creating a new watchface complication and managing it.
@@ -50,6 +52,7 @@ Header and package configuration files for the watchface complication developmen
 cp %{SOURCE1001} .
 cp %{SOURCE1002} .
 cp %{SOURCE1003} .
+cp %{SOURCE1004} .
 
 %build
 %if 0%{?gcov:1}
@@ -173,6 +176,40 @@ Header & package configuration files to support development of the watchface edi
 %{_libdir}/pkgconfig/watchface-editor.pc
 %attr(0644,root,root) %{_libdir}/libwatchface-editor.so
 
+
+#################################################
+# libwatchface-common
+#################################################
+%package -n libwatchface-common
+Summary: Library for developing the watchface common
+Group: Applications/Application Utility
+License: Apache-2.0
+
+%description -n libwatchface-common
+Provide utility to develop the watchface.
+
+%package -n libwatchface-common-devel
+Summary: Watchface common development library (dev)
+Group: Development/Libraries
+Requires: libwatchface-common
+
+%description -n libwatchface-common-devel
+Header & package configuration files to support development of the watchface editor.
+
+%post -n libwatchface-common -p /sbin/ldconfig
+%postun -n libwatchface-common -p /sbin/ldconfig
+
+%files -n libwatchface-common
+%manifest libwatchface-common.manifest
+%attr(0644,root,root) %{_libdir}/libwatchface-common.so.*
+%license LICENSE
+
+%files -n libwatchface-common-devel
+%{_includedir}/watchface-common/*.h
+%{_libdir}/pkgconfig/watchface-common.pc
+%attr(0644,root,root) %{_libdir}/libwatchface-common.so
+
+
 #################################################
 # gtest-watchface-complication
 #################################################
diff --git a/watchface-common/CMakeLists.txt b/watchface-common/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b8f45b6
--- /dev/null
@@ -0,0 +1,55 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(watchface-common CXX)
+
+SET(PREFIX "${CMAKE_INSTALL_PREFIX}")
+SET(EXEC_PREFIX "\${prefix}")
+SET(PROJECT_NAME "${PROJECT_NAME}")
+SET(LIBDIR ${LIB_INSTALL_DIR})
+SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
+SET(VERSION_MAJOR 1)
+SET(VERSION "${VERSION_MAJOR}.0.0")
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(watchface-common REQUIRED
+       glib-2.0
+       gio-2.0
+       bundle
+       dlog
+       aul
+       appsvc
+       capi-appfw-app-common
+       pkgmgr-installer
+       cynara-client
+       cynara-creds-gdbus
+       pkgmgr
+       pkgmgr-info
+       capi-system-info
+)
+
+FOREACH(flag ${watchface-common_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -std=c++11")
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
+SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
+SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCES)
+ADD_LIBRARY (${PROJECT_NAME} SHARED ${SOURCES})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
+
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${watchface-common_LDFLAGS} "-lpthread")
+
+CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
+
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-common.h DESTINATION include/watchface-common)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/watchface-common-internal.h DESTINATION include/watchface-common)
\ No newline at end of file
diff --git a/watchface-common/LICENSE b/watchface-common/LICENSE
new file mode 100644 (file)
index 0000000..a06208b
--- /dev/null
@@ -0,0 +1,204 @@
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/watchface-common/watchface-common.pc.in b/watchface-common/watchface-common.pc.in
new file mode 100644 (file)
index 0000000..33f423a
--- /dev/null
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
+
+Name: watchface-common
+Description: Support development of the watchface library
+Version: @VERSION@
+Libs: -L${libdir} -lwatchface-common
+Cflags: -I${includedir}
+cppflags: -I${includedir}
\ No newline at end of file
index 596e502..962db08 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <gio/gio.h>
 #include <string>
-#include "watchface-common.h"
+#include "watchface-common/include/watchface-common.h"
 
 #define PRIVILEGE_DATASHARING "http://tizen.org/privilege/datasharing"
 
@@ -31,21 +31,21 @@ enum cynara_result {
 
 namespace watchface_complication {
 namespace util {
-  bool CheckWatchFeatureEnabled();
-  int CheckPrivilege(const char* privilege);
-  int CheckPrivilege(std::string& privilege,
+  EXPORT_API bool CheckWatchFeatureEnabled();
+  EXPORT_API int CheckPrivilege(const char* privilege);
+  EXPORT_API int CheckPrivilege(std::string& privilege,
                                      GDBusConnection *connection,
                                      std::string& sender_name,
                                      std::string& sender_appid);
-  int GetSenderPid(GDBusConnection *conn, const std::string& sender_name);
-  std::string GetSenderAppid(GDBusConnection *conn,
+  EXPORT_API int GetSenderPid(GDBusConnection *conn, const std::string& sender_name);
+  EXPORT_API std::string GetSenderAppid(GDBusConnection *conn,
                           const std::string& sender_name);
-  bool CheckSender(const char* sender_app_id,
+  EXPORT_API bool CheckSender(const char* sender_app_id,
                                 const std::string& sender_name,
                                 GDBusConnection* conn);
-  bool CheckComplicationType(int type);
-  bool CheckCertificate(const std::string& provider_app_id);
-  char* GetAppID();
+  EXPORT_API bool CheckComplicationType(int type);
+  EXPORT_API bool CheckCertificate(const std::string& provider_app_id);
+  EXPORT_API char* GetAppID();
 }  // namespace util
 }  // namespace watchface_complication
 
index 30cb046..6abb8ff 100644 (file)
@@ -35,13 +35,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCES)
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common SOURCES)
 ADD_LIBRARY (${PROJECT_NAME} SHARED ${SOURCES})
 
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} watchface-complication ${watchface-complication-provider_LDFLAGS} "-lpthread -Wl,--no-undefined")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} watchface-complication watchface-common ${watchface-complication-provider_LDFLAGS} "-lpthread -Wl,--no-undefined")
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
index a08d374..76857d7 100644 (file)
@@ -6,7 +6,7 @@ includedir=@INCLUDEDIR@
 Name: watchface-complication-provider
 Description: Support development of the watchface complication provider library
 Version: @VERSION@
-Requires: watchface-complication
-Libs: -L${libdir} -lwatchface-complication-provider -lwatchface-complication
+Requires: watchface-complication watchface-common
+Libs: -L${libdir} -lwatchface-complication-provider -lwatchface-complication -lwatchface-common
 Cflags: -I${includedir}
 cppflags: -I${includedir}
index 06fbcbf..c86b3cf 100644 (file)
@@ -36,17 +36,15 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCES)
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common SOURCES)
 ADD_LIBRARY (${PROJECT_NAME} SHARED ${SOURCES})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${watchface-complication_LDFLAGS} "-lpthread")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} watchface-common ${watchface-complication_LDFLAGS} "-lpthread")
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
@@ -55,6 +53,4 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 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)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common/watchface-common-internal.h DESTINATION include/watchface-common)
\ No newline at end of file
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-complication.h DESTINATION include/${PROJECT_NAME})
\ No newline at end of file
index f4e7d12..b5d9821 100644 (file)
@@ -6,6 +6,7 @@ includedir=@INCLUDEDIR@
 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/
-cppflags: -I${includedir} -I${includedir}/../watchface-common/
\ No newline at end of file
+Requires: watchface-common
+Libs: -L${libdir} -lwatchface-complication -lwatchface-common
+Cflags: -I${includedir} -I${includedir}/../watchface-common/ -I${includedir}/../watchface-common/include/
+cppflags: -I${includedir} -I${includedir}/../watchface-common/ -I${includedir}/../watchface-common/include/
\ No newline at end of file
index dd5beea..ff5563a 100644 (file)
@@ -35,13 +35,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCES)
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common SOURCES)
 ADD_LIBRARY (${PROJECT_NAME} SHARED ${SOURCES})
 
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} watchface-complication ${watchface-editor_LDFLAGS} "-lpthread -Wl,--no-undefined")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} watchface-complication watchface-common ${watchface-editor_LDFLAGS} "-lpthread -Wl,--no-undefined")
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
 
index bd34510..06f94d3 100644 (file)
@@ -5,7 +5,7 @@ includedir=@INCLUDEDIR@
 Name: watchface-editor
 Description: Support development of the watchface editor library
 Version: @VERSION@
-Requires: watchface-complication
-Libs: -L${libdir} -lwatchface-editor -lwatchface-complication
+Requires: watchface-complication watchface-common
+Libs: -L${libdir} -lwatchface-editor -lwatchface-complication -lwatchface-common
 Cflags: -I${includedir}
 cppflags: -I${includedir}
\ No newline at end of file