ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-18 01:02:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-cmake: fix/refactoring search for lib.exe/dlltool.exe.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev)
2025-09-08 09:50:11 +03:00
parent 815d483803
commit 71f42a77d5
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@@ -579,9 +579,8 @@ if(WIN32 AND EXISTS "${MDBX_SOURCE_DIR}/ntdll.def")
if(MSVC) if(MSVC)
if(NOT MSVC_LIB_EXE) if(NOT MSVC_LIB_EXE)
# Find lib.exe # Find lib.exe
get_filename_component(CL_NAME ${CMAKE_C_COMPILER} NAME) get_filename_component(CC_DIR ${CMAKE_C_COMPILER} DIRECTORY)
string(REPLACE cl.exe lib.exe MSVC_LIB_EXE ${CL_NAME}) find_program(MSVC_LIB_EXE "lib.exe" HINTS ${CC_DIR})
find_program(MSVC_LIB_EXE ${MSVC_LIB_EXE})
endif() endif()
if(MSVC_LIB_EXE) if(MSVC_LIB_EXE)
message(STATUS "Found MSVC's lib tool: ${MSVC_LIB_EXE}") message(STATUS "Found MSVC's lib tool: ${MSVC_LIB_EXE}")
@@ -593,25 +592,24 @@ if(WIN32 AND EXISTS "${MDBX_SOURCE_DIR}/ntdll.def")
COMMAND ${MSVC_LIB_EXE} /def:"${MDBX_SOURCE_DIR}/ntdll.def" /out:"${MDBX_NTDLL_EXTRA_IMPLIB}" COMMAND ${MSVC_LIB_EXE} /def:"${MDBX_SOURCE_DIR}/ntdll.def" /out:"${MDBX_NTDLL_EXTRA_IMPLIB}"
${INITIAL_CMAKE_STATIC_LINKER_FLAGS}) ${INITIAL_CMAKE_STATIC_LINKER_FLAGS})
else() else()
message(WARNING "MSVC's lib tool not found") message(WARNING "MSVC's lib.exe not found")
endif() endif()
elseif(MINGW OR MINGW64) elseif(MINGW OR MINGW64)
if(NOT DLLTOOL) if(NOT MINGW_DLLTOOL_EXE)
# Find dlltool # Find dlltool.exe
get_filename_component(GCC_NAME ${CMAKE_C_COMPILER} NAME) get_filename_component(CC_DIR ${CMAKE_C_COMPILER} DIRECTORY)
string(REPLACE gcc dlltool DLLTOOL_NAME ${GCC_NAME}) find_program(MINGW_DLLTOOL_EXE "dlltool.exe" HINTS ${CC_DIR})
find_program(DLLTOOL NAMES ${DLLTOOL_NAME})
endif() endif()
if(DLLTOOL) if(MINGW_DLLTOOL_EXE)
message(STATUS "Found dlltool: ${DLLTOOL}") message(STATUS "Found MINGW's dlltool: ${MINGW_DLLTOOL_EXE}")
set(MDBX_NTDLL_EXTRA_IMPLIB "${CMAKE_CURRENT_BINARY_DIR}/mdbx_ntdll_extra.a") set(MDBX_NTDLL_EXTRA_IMPLIB "${CMAKE_CURRENT_BINARY_DIR}/mdbx_ntdll_extra.a")
add_custom_command( add_custom_command(
OUTPUT "${MDBX_NTDLL_EXTRA_IMPLIB}" OUTPUT "${MDBX_NTDLL_EXTRA_IMPLIB}"
COMMENT "Create extra-import-library for ntdll.dll" COMMENT "Create extra-import-library for ntdll.dll"
MAIN_DEPENDENCY "${MDBX_SOURCE_DIR}/ntdll.def" MAIN_DEPENDENCY "${MDBX_SOURCE_DIR}/ntdll.def"
COMMAND ${DLLTOOL} -d "${MDBX_SOURCE_DIR}/ntdll.def" -l "${MDBX_NTDLL_EXTRA_IMPLIB}") COMMAND ${MINGW_DLLTOOL_EXE} -d "${MDBX_SOURCE_DIR}/ntdll.def" -l "${MDBX_NTDLL_EXTRA_IMPLIB}")
else() else()
message(WARNING "dlltool not found") message(WARNING "MINGW's dlltool.exe not found")
endif() endif()
endif() endif()