diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | apps/nc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | apps/ocspcheck/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | apps/openssl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | crypto/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | include/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | man/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ssl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tls/CMakeLists.txt | 4 |
9 files changed, 16 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 570e0ef..dfb3d53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -6,6 +6,7 @@ include(CheckTypeSize) | |||
| 6 | 6 | ||
| 7 | set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH}) | 7 | set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH}) |
| 8 | include(cmake_export_symbol) | 8 | include(cmake_export_symbol) |
| 9 | include(GNUInstallDirs) | ||
| 9 | 10 | ||
| 10 | project (LibreSSL C) | 11 | project (LibreSSL C) |
| 11 | 12 | ||
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt index c8757a6..be38146 100644 --- a/apps/nc/CMakeLists.txt +++ b/apps/nc/CMakeLists.txt | |||
| @@ -53,8 +53,8 @@ add_executable(nc ${NC_SRC}) | |||
| 53 | target_link_libraries(nc tls ${OPENSSL_LIBS}) | 53 | target_link_libraries(nc tls ${OPENSSL_LIBS}) |
| 54 | 54 | ||
| 55 | if(ENABLE_NC) | 55 | if(ENABLE_NC) |
| 56 | install(TARGETS nc DESTINATION bin) | 56 | install(TARGETS nc DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 57 | install(FILES nc.1 DESTINATION share/man/man1) | 57 | install(FILES nc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
| 58 | endif() | 58 | endif() |
| 59 | 59 | ||
| 60 | endif() | 60 | endif() |
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt index a14485e..478f232 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt | |||
| @@ -36,7 +36,7 @@ endif() | |||
| 36 | add_executable(ocspcheck ${OCSPCHECK_SRC}) | 36 | add_executable(ocspcheck ${OCSPCHECK_SRC}) |
| 37 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) | 37 | target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) |
| 38 | 38 | ||
| 39 | install(TARGETS ocspcheck DESTINATION bin) | 39 | install(TARGETS ocspcheck DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 40 | install(FILES ocspcheck.8 DESTINATION share/man/man8) | 40 | install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) |
| 41 | 41 | ||
| 42 | endif() | 42 | endif() |
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt index 9512065..2e47840 100644 --- a/apps/openssl/CMakeLists.txt +++ b/apps/openssl/CMakeLists.txt | |||
| @@ -76,8 +76,8 @@ endif() | |||
| 76 | add_executable(openssl ${OPENSSL_SRC}) | 76 | add_executable(openssl ${OPENSSL_SRC}) |
| 77 | target_link_libraries(openssl ${OPENSSL_LIBS}) | 77 | target_link_libraries(openssl ${OPENSSL_LIBS}) |
| 78 | 78 | ||
| 79 | install(TARGETS openssl DESTINATION bin) | 79 | install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 80 | install(FILES openssl.1 DESTINATION share/man/man1) | 80 | install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
| 81 | 81 | ||
| 82 | if(NOT "${OPENSSLDIR}" STREQUAL "") | 82 | if(NOT "${OPENSSLDIR}" STREQUAL "") |
| 83 | set(CONF_DIR "${OPENSSLDIR}") | 83 | set(CONF_DIR "${OPENSSLDIR}") |
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index f8c5684..eca9d1c 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt | |||
| @@ -829,9 +829,9 @@ if (BUILD_SHARED) | |||
| 829 | ARCHIVE_OUTPUT_NAME crypto${CRYPTO_POSTFIX}) | 829 | ARCHIVE_OUTPUT_NAME crypto${CRYPTO_POSTFIX}) |
| 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 | install(TARGETS crypto crypto-shared DESTINATION lib) | 832 | install(TARGETS crypto crypto-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 833 | else() | 833 | else() |
| 834 | add_library(crypto STATIC ${CRYPTO_SRC}) | 834 | add_library(crypto STATIC ${CRYPTO_SRC}) |
| 835 | install(TARGETS crypto DESTINATION lib) | 835 | install(TARGETS crypto DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 836 | endif() | 836 | endif() |
| 837 | 837 | ||
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 110caa5..ccb6589 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | install(DIRECTORY . | 1 | install(DIRECTORY . |
| 2 | DESTINATION include | 2 | DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
| 3 | PATTERN "CMakeLists.txt" EXCLUDE | 3 | PATTERN "CMakeLists.txt" EXCLUDE |
| 4 | PATTERN "compat" EXCLUDE | 4 | PATTERN "compat" EXCLUDE |
| 5 | PATTERN "Makefile*" EXCLUDE) | 5 | PATTERN "Makefile*" EXCLUDE) |
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 5923f58..454b1ee 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | install(DIRECTORY . | 1 | install(DIRECTORY . |
| 2 | DESTINATION share/man/man3 | 2 | DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 |
| 3 | FILES_MATCHING PATTERN "*.3" | 3 | FILES_MATCHING PATTERN "*.3" |
| 4 | ) | 4 | ) |
| 5 | 5 | ||
| 6 | install(DIRECTORY . | 6 | install(DIRECTORY . |
| 7 | DESTINATION share/man/man1 | 7 | DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 |
| 8 | FILES_MATCHING PATTERN "*.1" | 8 | FILES_MATCHING PATTERN "*.1" |
| 9 | ) | 9 | ) |
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index bc2fea4..5403942 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt | |||
| @@ -60,8 +60,8 @@ if (BUILD_SHARED) | |||
| 60 | ARCHIVE_OUTPUT_NAME ssl${SSL_POSTFIX}) | 60 | ARCHIVE_OUTPUT_NAME ssl${SSL_POSTFIX}) |
| 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 | install(TARGETS ssl ssl-shared DESTINATION lib) | 63 | install(TARGETS ssl ssl-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 64 | else() | 64 | else() |
| 65 | add_library(ssl STATIC ${SSL_SRC}) | 65 | add_library(ssl STATIC ${SSL_SRC}) |
| 66 | install(TARGETS ssl DESTINATION lib) | 66 | install(TARGETS ssl DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 67 | endif() | 67 | endif() |
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt index b71fb37..c3e6336 100644 --- a/tls/CMakeLists.txt +++ b/tls/CMakeLists.txt | |||
| @@ -39,9 +39,9 @@ if (BUILD_SHARED) | |||
| 39 | ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX}) | 39 | ARCHIVE_OUTPUT_NAME tls${TLS_POSTFIX}) |
| 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 | install(TARGETS tls tls-shared DESTINATION lib) | 42 | install(TARGETS tls tls-shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 43 | else() | 43 | else() |
| 44 | add_library(tls STATIC ${TLS_SRC}) | 44 | add_library(tls STATIC ${TLS_SRC}) |
| 45 | install(TARGETS tls DESTINATION lib) | 45 | install(TARGETS tls DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 46 | endif() | 46 | endif() |
| 47 | 47 | ||