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

Merge branch 'master' of https://github.com/libressl-portable/portable into SkipInstall

Browse Source 
Fix merge conflicts from GNUInstallDirs merge to master.
This commit is contained in:
d3x0r
2017-07-06 23:11:11 -07:00
parent 2557dd7439 334245374a
commit a4d80ca56a
11 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/CMakeLists.txt
View File

@@ -830,12 +830,12 @@ if (BUILD_SHARED)
set_target_properties(crypto-shared PROPERTIES VERSION
${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS crypto crypto-shared DESTINATION lib)
install(TARGETS crypto crypto-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
else()
add_library(crypto STATIC ${CRYPTO_SRC})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS crypto DESTINATION lib)
install(TARGETS crypto DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
endif()