mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-07 04:24:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5724 from Biswa96/cmake-mingw

Browse Source 
cmake: Fix runtime library install location in mingw
This commit is contained in:
Dave Rodgman 2022-05-25 13:34:43 +01:00 committed by GitHub
commit 32c995afa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/everest/CMakeLists.txt vendored
View File

@ -23,5 +23,5 @@ endif(INSTALL_MBEDTLS_HEADERS)
install(TARGETS everest install(TARGETS everest
EXPORT MbedTLSTargets EXPORT MbedTLSTargets
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)

5
CMakeLists.txt
View File

@ -39,6 +39,8 @@ else()
project("mbed TLS" C) project("mbed TLS" C)
endif() endif()
include(GNUInstallDirs)
# Determine if mbed TLS is being built as a subproject using add_subdirectory() # Determine if mbed TLS is being built as a subproject using add_subdirectory()
if(NOT DEFINED MBEDTLS_AS_SUBPROJECT) if(NOT DEFINED MBEDTLS_AS_SUBPROJECT)
set(MBEDTLS_AS_SUBPROJECT ON) set(MBEDTLS_AS_SUBPROJECT ON)
@ -252,8 +254,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
endif(CMAKE_BUILD_TYPE STREQUAL "Coverage") endif(CMAKE_BUILD_TYPE STREQUAL "Coverage")
if(LIB_INSTALL_DIR) if(LIB_INSTALL_DIR)
else() set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
set(LIB_INSTALL_DIR lib)
endif() endif()
add_subdirectory(include) add_subdirectory(include)

3
ChangeLog.d/cmake_fix_dll_install.txt Normal file
View File

@ -0,0 +1,3 @@
Changes
* cmake: Fix runtime library install location in mingw
This install DLLs in bin directory instead of lib.

5
ChangeLog.d/cmake_use_GnuInstallDirs.txt Normal file
View File

@ -0,0 +1,5 @@
Changes
* cmake: Use GnuInstallDirs to customize install directories
Replace custom LIB_INSTALL_DIR variable with standard CMAKE_INSTALL_LIBDIR
variable. For backward compatibility, set CMAKE_INSTALL_LIBDIR if
LIB_INSTALL_DIR is set.

4
library/CMakeLists.txt
View File

@ -291,7 +291,9 @@ foreach(target IN LISTS target_libraries)
install( install(
TARGETS ${target} TARGETS ${target}
EXPORT MbedTLSTargets EXPORT MbedTLSTargets
DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
endforeach(target) endforeach(target)