diff options
| author | d3x0r <d3x0r@users.noreply.github.com> | 2017-07-06 23:11:11 -0700 |
|---|---|---|
| committer | d3x0r <d3x0r@users.noreply.github.com> | 2017-07-06 23:11:11 -0700 |
| commit | a4d80ca56acc05b92be6015a50cae3d46f081440 (patch) | |
| tree | 8766676bb4d08cffc7eff748b76c6e0530892b76 /crypto | |
| parent | 2557dd7439806448ad41b7bc5f175f4ed4f74d9c (diff) | |
| parent | 334245374a084ba175225c209ac9e18af5a60150 (diff) | |
| download | portable-a4d80ca56acc05b92be6015a50cae3d46f081440.tar.gz portable-a4d80ca56acc05b92be6015a50cae3d46f081440.tar.bz2 portable-a4d80ca56acc05b92be6015a50cae3d46f081440.zip | |
Merge branch 'master' of https://github.com/libressl-portable/portable into SkipInstall
Fix merge conflicts from GNUInstallDirs merge to master.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index a2b4817..aa289aa 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -830,12 +830,12 @@ if (BUILD_SHARED) | |||
| 830 | set_target_properties(crypto-shared PROPERTIES VERSION | 830 | set_target_properties(crypto-shared PROPERTIES VERSION |
| 831 | ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) | 831 | ${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION}) |
| 832 | if(ENABLE_LIBRESSL_INSTALL) | 832 | if(ENABLE_LIBRESSL_INSTALL) |
| 833 | install(TARGETS crypto crypto-shared DESTINATION lib) | 833 | install(TARGETS crypto crypto-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 834 | endif(ENABLE_LIBRESSL_INSTALL) | 834 | endif(ENABLE_LIBRESSL_INSTALL) |
| 835 | else() | 835 | else() |
| 836 | add_library(crypto STATIC ${CRYPTO_SRC}) | 836 | add_library(crypto STATIC ${CRYPTO_SRC}) |
| 837 | if(ENABLE_LIBRESSL_INSTALL) | 837 | if(ENABLE_LIBRESSL_INSTALL) |
| 838 | install(TARGETS crypto DESTINATION lib) | 838 | install(TARGETS crypto DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 839 | endif(ENABLE_LIBRESSL_INSTALL) | 839 | endif(ENABLE_LIBRESSL_INSTALL) |
| 840 | endif() | 840 | endif() |
| 841 | 841 | ||