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 /ssl | |
| 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 'ssl')
| -rw-r--r-- | ssl/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 0e1c326..bad7276 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
| @@ -61,11 +61,11 @@ if (BUILD_SHARED) | |||
| 61 | set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} | 61 | set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION} |
| 62 | SOVERSION ${SSL_MAJOR_VERSION}) | 62 | SOVERSION ${SSL_MAJOR_VERSION}) |
| 63 | if(ENABLE_LIBRESSL_INSTALL) | 63 | if(ENABLE_LIBRESSL_INSTALL) |
| 64 | install(TARGETS ssl ssl-shared DESTINATION lib) | 64 | install(TARGETS ssl ssl-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 65 | endif(ENABLE_LIBRESSL_INSTALL) | 65 | endif(ENABLE_LIBRESSL_INSTALL) |
| 66 | else() | 66 | else() |
| 67 | add_library(ssl STATIC ${SSL_SRC}) | 67 | add_library(ssl STATIC ${SSL_SRC}) |
| 68 | if(ENABLE_LIBRESSL_INSTALL) | 68 | if(ENABLE_LIBRESSL_INSTALL) |
| 69 | install(TARGETS ssl DESTINATION lib) | 69 | install(TARGETS ssl DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 70 | endif(ENABLE_LIBRESSL_INSTALL) | 70 | endif(ENABLE_LIBRESSL_INSTALL) |
| 71 | endif() | 71 | endif() |