factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kinichiro 2018-10-05 22:59:44 +09:00
parent f819a2bce7
commit 0b8343ace3
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -55,7 +55,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
add_definitions(-D_BSD_SOURCE) add_definitions(-D_BSD_SOURCE)
add_definitions(-D_POSIX_SOURCE) add_definitions(-D_POSIX_SOURCE)
add_definitions(-D_GNU_SOURCE) add_definitions(-D_GNU_SOURCE)
set(PLATFORM_LDADD ${PLATFORM_LDADD} pthread) set(PLATFORM_LIBS ${PLATFORM_LIBS} pthread)
endif() endif()
if(CMAKE_SYSTEM_NAME MATCHES "MINGW") 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") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 +DD64 +Otype_safety=off")
endif() endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT") 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() endif()
if(CMAKE_SYSTEM_NAME MATCHES "SunOS") 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} -D_XOPEN_SOURCE=600")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBSD_COMP")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic")
set(PLATFORM_LDADD ${PLATFORM_LDADD} nsl socket) set(PLATFORM_LIBS ${PLATFORM_LIBS} nsl socket)
endif() endif()
add_definitions(-DLIBRESSL_INTERNAL) add_definitions(-DLIBRESSL_INTERNAL)
@ -104,7 +104,7 @@ if(WIN32)
add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS) add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600) add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600)
add_definitions(-DCPPFLAGS -DOPENSSL_NO_SPEED -DNO_SYSLOG -DNO_CRYPT) 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() endif()
if(MSVC) if(MSVC)
@ -270,7 +270,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
# Check if we need -lrt to get clock_gettime on Linux # Check if we need -lrt to get clock_gettime on Linux
check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME) check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
if (HAVE_CLOCK_GETTIME) if (HAVE_CLOCK_GETTIME)
set(PLATFORM_LDADD ${PLATFORM_LDADD} rt) set(PLATFORM_LIBS ${PLATFORM_LIBS} rt)
endif() endif()
else() else()
# Otherwise, simply check if it exists # Otherwise, simply check if it exists
@ -289,7 +289,7 @@ if(SIZEOF_TIME_T STREQUAL "4")
endif() endif()
add_definitions(-DSIZEOF_TIME_T=${SIZEOF_TIME_T}) 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(crypto)
add_subdirectory(ssl) add_subdirectory(ssl)
@ -312,6 +312,7 @@ if(NOT MSVC)
set(exec_prefix \${prefix}) set(exec_prefix \${prefix})
set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
set(includedir \${prefix}/include) set(includedir \${prefix}/include)
string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}")
file(STRINGS "VERSION" VERSION LIMIT_COUNT 1) file(STRINGS "VERSION" VERSION LIMIT_COUNT 1)
file(GLOB OPENSSL_PKGCONFIGS "*.pc.in") file(GLOB OPENSSL_PKGCONFIGS "*.pc.in")
foreach(file ${OPENSSL_PKGCONFIGS}) foreach(file ${OPENSSL_PKGCONFIGS})

2
crypto/CMakeLists.txt
View File

@ -814,7 +814,7 @@ target_include_directories(crypto
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
target_link_libraries(crypto ${PLATFORM_LDADD}) target_link_libraries(crypto ${PLATFORM_LIBS})
if (WIN32) if (WIN32)
set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION}) set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})
endif() endif()

2
ssl/CMakeLists.txt
View File

@ -51,7 +51,7 @@ target_include_directories(ssl
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) 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) if (WIN32)
set(SSL_POSTFIX -${SSL_MAJOR_VERSION}) set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
endif() endif()

2
tls/CMakeLists.txt
View File

@ -40,7 +40,7 @@ target_include_directories(tls
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
export_symbol(tls ${CMAKE_CURRENT_SOURCE_DIR}/tls.sym) 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) if (WIN32)
set(TLS_POSTFIX -${TLS_MAJOR_VERSION}) set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
endif() endif()