Fix cmake to generate proper Libs.private in .pc files

4 files changed, 10 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27cd8da..8fde8cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
         add_definitions(-D_BSD_SOURCE)
         add_definitions(-D_POSIX_SOURCE)
         add_definitions(-D_GNU_SOURCE)
-        set(PLATFORM_LDADD ${PLATFORM_LDADD} pthread)
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} pthread)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "MINGW")
@@ -74,7 +74,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
                 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 +DD64 +Otype_safety=off")
         endif()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT")
-        set(PLATFORM_LDADD ${PLATFORM_LDADD} pthread)
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} pthread)
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
@@ -83,7 +83,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic")
-        set(PLATFORM_LDADD ${PLATFORM_LDADD} nsl socket)
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} nsl socket)
 endif()
 
 add_definitions(-DLIBRESSL_INTERNAL)
@@ -104,7 +104,7 @@ if(WIN32)
         add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
         add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
         add_definitions(-DCPPFLAGS -DOPENSSL_NO_SPEED -DNO_SYSLOG -DNO_CRYPT)
-        set(PLATFORM_LDADD ${PLATFORM_LDADD} ws2_32)
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
 endif()
 
 if(MSVC)
@@ -270,7 +270,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
         # Check if we need -lrt to get clock_gettime on Linux
         check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
         if (HAVE_CLOCK_GETTIME)
-                set(PLATFORM_LDADD ${PLATFORM_LDADD} rt)
+                set(PLATFORM_LIBS ${PLATFORM_LIBS} rt)
         endif()
 else()
         # Otherwise, simply check if it exists
@@ -289,7 +289,7 @@ if(SIZEOF_TIME_T STREQUAL "4")
 endif()
 add_definitions(-DSIZEOF_TIME_T=${SIZEOF_TIME_T})
 
-set(OPENSSL_LIBS tls ssl crypto ${PLATFORM_LDADD})
+set(OPENSSL_LIBS tls ssl crypto ${PLATFORM_LIBS})
 
 add_subdirectory(crypto)
 add_subdirectory(ssl)
@@ -312,6 +312,7 @@ if(NOT MSVC)
         set(exec_prefix \${prefix})
         set(libdir      \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
         set(includedir  \${prefix}/include)
+        string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}")
         file(STRINGS    "VERSION" VERSION LIMIT_COUNT 1)
         file(GLOB       OPENSSL_PKGCONFIGS "*.pc.in")
         foreach(file ${OPENSSL_PKGCONFIGS})
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 8b66001..ed85a11 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -814,7 +814,7 @@ target_include_directories(crypto
 
 if (BUILD_SHARED_LIBS)
         export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
-        target_link_libraries(crypto ${PLATFORM_LDADD})
+        target_link_libraries(crypto ${PLATFORM_LIBS})
         if (WIN32)
                 set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})
         endif()
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 22dc989..8596d25 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -51,7 +51,7 @@ target_include_directories(ssl
 
 if (BUILD_SHARED_LIBS)
         export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
-        target_link_libraries(ssl crypto ${PLATFORM_LDADD})
+        target_link_libraries(ssl crypto ${PLATFORM_LIBS})
         if (WIN32)
                 set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
         endif()
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 6dc0501..337e89b 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -40,7 +40,7 @@ target_include_directories(tls
 
 if (BUILD_SHARED_LIBS)
         export_symbol(tls ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym)
-        target_link_libraries(tls ssl crypto ${PLATFORM_LDADD})
+        target_link_libraries(tls ssl crypto ${PLATFORM_LIBS})
         if (WIN32)
                 set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
         endif()