|
2848
|
1 This file is part of MXE. |
|
|
2 See index.html for further information. |
|
|
3 |
|
2851
|
4 From f74fad8e74da1a17ca90046d735e666bee767722 Mon Sep 17 00:00:00 2001 |
|
2848
|
5 From: Mark Brand <mabrand@mabrand.nl> |
|
|
6 Date: Mon, 12 Nov 2012 12:28:25 +0100 |
|
2851
|
7 Subject: [PATCH 1/2] disable shared libs |
|
2848
|
8 |
|
|
9 |
|
|
10 diff --git a/CMakeLists.txt b/CMakeLists.txt |
|
|
11 index 5be9ca3..ce0fc09 100644 |
|
|
12 --- a/CMakeLists.txt |
|
|
13 +++ b/CMakeLists.txt |
|
|
14 @@ -81,21 +81,6 @@ IF(UNIX AND NOT APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_v |
|
|
15 ENDIF() |
|
|
16 ENDIF() |
|
|
17 |
|
|
18 -# Shared library |
|
|
19 -ADD_LIBRARY( |
|
|
20 - ${VMIME_LIBRARY_NAME} |
|
|
21 - SHARED |
|
|
22 - ${VMIME_LIBRARY_SRC_FILES} |
|
|
23 - ${VMIME_LIBRARY_INCLUDE_FILES} |
|
|
24 -) |
|
|
25 - |
|
|
26 -SET_TARGET_PROPERTIES( |
|
|
27 - ${VMIME_LIBRARY_NAME} |
|
|
28 - PROPERTIES |
|
|
29 - VERSION "${VMIME_VERSION}" |
|
|
30 - SOVERSION "${VMIME_API_VERSION}" |
|
|
31 -) |
|
|
32 - |
|
|
33 # Static library |
|
|
34 # |
|
|
35 # Note: cannot have two targets with the same name so the static version has |
|
|
36 @@ -115,19 +100,12 @@ SET_TARGET_PROPERTIES( |
|
|
37 |
|
|
38 # These next two lines are required but it is unclear exactly what they do. |
|
|
39 # The CMake FAQ mentions they are necessary and it does not work otherwise. |
|
|
40 -SET_TARGET_PROPERTIES(${VMIME_LIBRARY_NAME} PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
|
|
41 SET_TARGET_PROPERTIES(${VMIME_LIBRARY_NAME}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) |
|
|
42 |
|
|
43 SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries") |
|
|
44 |
|
|
45 # Installation of libraries |
|
|
46 INSTALL( |
|
|
47 - TARGETS ${VMIME_LIBRARY_NAME} |
|
|
48 - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sharedlibs |
|
|
49 - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT sharedlibs |
|
|
50 -) |
|
|
51 - |
|
|
52 -INSTALL( |
|
|
53 TARGETS ${VMIME_LIBRARY_NAME}-static |
|
|
54 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs |
|
|
55 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT staticlibs |
|
|
56 @@ -215,11 +193,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "\\\\.git;~$;build/") |
|
|
57 SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}) |
|
|
58 |
|
|
59 # Set components |
|
|
60 -SET(CPACK_COMPONENTS_ALL sharedlibs staticlibs headers) |
|
|
61 - |
|
|
62 -SET(CPACK_COMPONENT_SHAREDLIBS_DISPLAY_NAME "Shared libraries") |
|
|
63 -SET(CPACK_COMPONENT_SHAREDLIBS_DESCRIPTION |
|
|
64 - "Shared library for general use.") |
|
|
65 +SET(CPACK_COMPONENTS_ALL staticlibs headers) |
|
|
66 |
|
|
67 SET(CPACK_COMPONENT_STATICLIBS_DISPLAY_NAME "Static libraries") |
|
|
68 SET(CPACK_COMPONENT_STATICLIBS_DESCRIPTION |
|
|
69 @@ -229,7 +203,6 @@ SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers") |
|
|
70 SET(CPACK_COMPONENT_HEADERS_DESCRIPTION |
|
|
71 "C/C++ header files.") |
|
|
72 |
|
|
73 -SET(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development") |
|
|
74 SET(CPACK_COMPONENT_STATICLIBS_GROUP "Development") |
|
|
75 SET(CPACK_COMPONENT_HEADERS_GROUP "Development") |
|
|
76 SET(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "") |
|
|
77 @@ -431,12 +404,6 @@ IF(VMIME_HAVE_SASL_SUPPORT) |
|
|
78 ${GSASL_INCLUDE_DIR} |
|
|
79 ) |
|
|
80 |
|
|
81 - TARGET_LINK_LIBRARIES( |
|
|
82 - ${VMIME_LIBRARY_NAME} |
|
|
83 - ${TARGET_LINK_LIBRARIES} |
|
|
84 - ${GSASL_LIBRARIES} |
|
|
85 - ) |
|
|
86 - |
|
|
87 SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GSASL_LIBRARIES}") |
|
|
88 SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GSASL_INCLUDE_DIR}") |
|
|
89 SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl") |
|
|
90 @@ -488,12 +455,6 @@ IF(VMIME_HAVE_TLS_SUPPORT) |
|
|
91 ${GNUTLS_LIBRARY_DIRS} |
|
|
92 ) |
|
|
93 |
|
|
94 - TARGET_LINK_LIBRARIES( |
|
|
95 - ${VMIME_LIBRARY_NAME} |
|
|
96 - ${TARGET_LINK_LIBRARIES} |
|
|
97 - ${GNUTLS_LIBRARY} |
|
|
98 - ) |
|
|
99 - |
|
|
100 SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GNUTLS_LIBRARY_DIRS} ${GNUTLS_LIBRARY}") |
|
|
101 SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GNUTLS_INCLUDE_DIR}") |
|
|
102 SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgnutls") |
|
|
103 @@ -505,12 +466,6 @@ IF(VMIME_HAVE_TLS_SUPPORT) |
|
|
104 ${OPENSSL_INCLUDE_DIR} |
|
|
105 ) |
|
|
106 |
|
|
107 - TARGET_LINK_LIBRARIES( |
|
|
108 - ${VMIME_LIBRARY_NAME} |
|
|
109 - ${TARGET_LINK_LIBRARIES} |
|
|
110 - ${OPENSSL_LIBRARIES} |
|
|
111 - ) |
|
|
112 - |
|
|
113 SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${OPENSSL_LIBRARIES}") |
|
|
114 SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${OPENSSL_INCLUDE_DIR}") |
|
|
115 SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libopenssl") |
|
|
116 @@ -534,12 +489,6 @@ INCLUDE_DIRECTORIES( |
|
|
117 ${ICONV_INCLUDE_DIR} |
|
|
118 ) |
|
|
119 |
|
|
120 -TARGET_LINK_LIBRARIES( |
|
|
121 - ${VMIME_LIBRARY_NAME} |
|
|
122 - ${TARGET_LINK_LIBRARIES} |
|
|
123 - ${ICONV_LIBRARIES} |
|
|
124 -) |
|
|
125 - |
|
|
126 |
|
|
127 ############################################################################## |
|
|
128 # Platform |
|
|
129 -- |
|
|
130 1.7.10.4 |
|
|
131 |
|
|
132 |
|
2851
|
133 From 739e6b49b1f421fa39e2e3e292932ff5c200626d Mon Sep 17 00:00:00 2001 |
|
2848
|
134 From: Mark Brand <mabrand@mabrand.nl> |
|
|
135 Date: Mon, 12 Nov 2012 13:58:12 +0100 |
|
2851
|
136 Subject: [PATCH 2/2] add private dependencies to .pc file |
|
2848
|
137 |
|
|
138 |
|
|
139 diff --git a/libvmime.pc.in b/libvmime.pc.in |
|
|
140 index 5745c52..cea2927 100644 |
|
|
141 --- a/libvmime.pc.in |
|
|
142 +++ b/libvmime.pc.in |
|
|
143 @@ -7,6 +7,8 @@ Name: @VMIME_LIBRARY_NAME@ |
|
|
144 Description: @VMIME_PACKAGE_DESCRIPTION@ |
|
|
145 Version: @VMIME_PACKAGE_VERSION@ |
|
|
146 Requires: @VMIME_PKGCONFIG_REQUIRES@ |
|
|
147 +Requires.private: gnutls libgsasl |
|
|
148 Libs: -L${libdir} -lvmime @VMIME_PKGCONFIG_LIBS@ |
|
|
149 +Libs.private: -liconv |
|
|
150 Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ |
|
|
151 |
|
|
152 -- |
|
|
153 1.7.10.4 |
|
|
154 |
