mdbx-cmake: использование WIN32 вместо ${CMAKE_SYSTEM_NAME}.

This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2024-09-18 07:59:24 +03:00
parent c964523978
commit c96714423d
2 changed files with 6 additions and 6 deletions

View File

@ -495,7 +495,7 @@ if(NOT DEFINED MDBX_C_STANDARD)
endif()
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND EXISTS "${MDBX_SOURCE_DIR}/ntdll.def")
if(WIN32 AND EXISTS "${MDBX_SOURCE_DIR}/ntdll.def")
if(MSVC)
if(NOT MSVC_LIB_EXE)
# Find lib.exe
@ -592,7 +592,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR IOS)
add_mdbx_option(MDBX_OSX_SPEED_INSTEADOF_DURABILITY "Disable use fcntl(F_FULLFSYNC) in favor of speed" OFF)
mark_as_advanced(MDBX_OSX_SPEED_INSTEADOF_DURABILITY)
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
if(WIN32)
if(MDBX_NTDLL_EXTRA_IMPLIB)
add_mdbx_option(MDBX_WITHOUT_MSVC_CRT "Avoid dependence from MSVC CRT and use ntdll.dll instead" OFF)
endif()
@ -825,7 +825,7 @@ macro(libmdbx_setup_libs TARGET MODE)
else()
target_link_libraries(${TARGET} ${MODE} Threads::Threads)
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
if(WIN32)
target_link_libraries(${TARGET} ${MODE} ntdll user32 kernel32 advapi32 ole32)
if(MDBX_NTDLL_EXTRA_IMPLIB AND MDBX_WITHOUT_MSVC_CRT)
target_link_libraries(${TARGET} ${MODE} ntdll_extra)
@ -913,7 +913,7 @@ endif()
# build mdbx-tools
if(MDBX_BUILD_TOOLS)
set(WINGETOPT_SRC "")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
if(WIN32)
set(WINGETOPT_SRC ${MDBX_SOURCE_DIR}/tools/wingetopt.c ${MDBX_SOURCE_DIR}/tools/wingetopt.h)
endif()

View File

@ -53,7 +53,7 @@ target_setup_options(mdbx_test)
if(NOT MDBX_BUILD_CXX)
target_compile_definitions(mdbx_test PRIVATE MDBX_BUILD_CXX=1)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
if(WIN32)
target_compile_definitions(mdbx_test PRIVATE MDBX_WITHOUT_MSVC_CRT=0)
endif()
endif()
@ -71,7 +71,7 @@ if(CMAKE_VERSION VERSION_LESS 3.1)
else()
target_link_libraries(mdbx_test ${TOOL_MDBX_LIB} ${LIB_MATH} Threads::Threads)
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
if(WIN32)
target_link_libraries(mdbx_test winmm.lib)
endif()