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 /tls | |
| 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 'tls')
| -rw-r--r-- | tls/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index ab73460..c8de04c 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
| @@ -40,12 +40,12 @@ if (BUILD_SHARED) | |||
| 40 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} | 40 | set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION} |
| 41 | SOVERSION ${TLS_MAJOR_VERSION}) | 41 | SOVERSION ${TLS_MAJOR_VERSION}) |
| 42 | if(ENABLE_LIBRESSL_INSTALL) | 42 | if(ENABLE_LIBRESSL_INSTALL) |
| 43 | install(TARGETS tls tls-shared DESTINATION lib) | 43 | install(TARGETS tls tls-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 44 | endif(ENABLE_LIBRESSL_INSTALL) | 44 | endif(ENABLE_LIBRESSL_INSTALL) |
| 45 | else() | 45 | else() |
| 46 | add_library(tls STATIC ${TLS_SRC}) | 46 | add_library(tls STATIC ${TLS_SRC}) |
| 47 | if(ENABLE_LIBRESSL_INSTALL) | 47 | if(ENABLE_LIBRESSL_INSTALL) |
| 48 | install(TARGETS tls DESTINATION lib) | 48 | install(TARGETS tls DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 49 | endif(ENABLE_LIBRESSL_INSTALL) | 49 | endif(ENABLE_LIBRESSL_INSTALL) |
| 50 | endif() | 50 | endif() |
| 51 | 51 | ||