Browse Source

fix(whl/windows): force use /MT for windows whl

GitOrigin-RevId: 54a7814c17
release-1.1
Megvii Engine Team 4 years ago
parent
commit
00de4cd9ae
2 changed files with 10 additions and 0 deletions
  1. +8
    -0
      CMakeLists.txt
  2. +2
    -0
      imperative/CMakeLists.txt

+ 8
- 0
CMakeLists.txt View File

@@ -152,6 +152,14 @@ if(${MGE_ARCH} STREQUAL "x86_64" OR ${MGE_ARCH} STREQUAL "i386" OR ${MGE_ARCH} S
endif() endif()


if(MSVC OR WIN32) if(MSVC OR WIN32)
# for cmake after 3.15.2
cmake_policy(SET CMP0091 NEW)
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDebug")
else()
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
endif()

add_compile_definitions(NOMINMAX=1 _USE_MATH_DEFINES=1 WIN32=1) add_compile_definitions(NOMINMAX=1 _USE_MATH_DEFINES=1 WIN32=1)
message("-- into windows build...") message("-- into windows build...")
message("-- CMAKE_C_COMPILER_ID: ${CMAKE_C_COMPILER_ID}") message("-- CMAKE_C_COMPILER_ID: ${CMAKE_C_COMPILER_ID}")


+ 2
- 0
imperative/CMakeLists.txt View File

@@ -57,6 +57,8 @@ if (APPLE)
elseif (MSVC OR WIN32) elseif (MSVC OR WIN32)
# Windows does not support implicitly importing data members from DLL. # Windows does not support implicitly importing data members from DLL.
target_link_libraries(${MODULE_NAME} PRIVATE megbrain megdnn) target_link_libraries(${MODULE_NAME} PRIVATE megbrain megdnn)
message("-- CMAKE_MSVC_RUNTIME_LIBRARY: ${CMAKE_MSVC_RUNTIME_LIBRARY}")
set_target_properties(${MODULE_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "${CMAKE_MSVC_RUNTIME_LIBRARY}")
else() else()
target_link_libraries(${MODULE_NAME} PRIVATE megengine_export -Wl,--version-script=${VERSION_SCRIPT}) target_link_libraries(${MODULE_NAME} PRIVATE megengine_export -Wl,--version-script=${VERSION_SCRIPT})
endif() endif()


Loading…
Cancel
Save