diff options
Diffstat (limited to '')
-rw-r--r-- | tls/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tls/Makefile.am | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index 1f78038..dcefad7 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
@@ -33,9 +33,8 @@ add_library(tls-objects OBJECT ${TLS_SRC}) | |||
33 | if (BUILD_SHARED) | 33 | if (BUILD_SHARED) |
34 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) | 34 | add_library(tls STATIC $<TARGET_OBJECTS:tls-objects>) |
35 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) | 35 | add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>) |
36 | export_symbol(tls-shared ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym) | ||
36 | if (WIN32) | 37 | if (WIN32) |
37 | target_sources(tls-shared PRIVATE | ||
38 | ${CMAKE_CURRENT_SOURCE_DIR}/tls.def) | ||
39 | target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib) | 38 | target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib) |
40 | set(TLS_POSTFIX -${TLS_MAJOR_VERSION}) | 39 | set(TLS_POSTFIX -${TLS_MAJOR_VERSION}) |
41 | endif() | 40 | endif() |
diff --git a/tls/Makefile.am b/tls/Makefile.am index 3212dfd..b6fdd58 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
@@ -4,7 +4,6 @@ lib_LTLIBRARIES = libtls.la | |||
4 | 4 | ||
5 | EXTRA_DIST = VERSION | 5 | EXTRA_DIST = VERSION |
6 | EXTRA_DIST += CMakeLists.txt | 6 | EXTRA_DIST += CMakeLists.txt |
7 | EXTRA_DIST += tls.def | ||
8 | EXTRA_DIST += tls.sym | 7 | EXTRA_DIST += tls.sym |
9 | 8 | ||
10 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym | 9 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym |