minor patch for MinGW build

This commit is contained in:
Ed Bordin 2020-05-14 16:35:55 +10:00
parent 2692c6f6cc
commit 7b84ed94b5

View File

@ -18,9 +18,11 @@ set(link_param "")
if (STATIC_BUILD) if (STATIC_BUILD)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND MSVC) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(CMAKE_CXX_FLAGS_RELEASE "/MT") if (MSVC)
set(CMAKE_CXX_FLAGS_DEBUG "/MTd") set(CMAKE_CXX_FLAGS_RELEASE "/MT")
set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
endif()
if (BUILD_PYTHON) if (BUILD_PYTHON)
add_definitions(-DBOOST_PYTHON_STATIC_LIB) add_definitions(-DBOOST_PYTHON_STATIC_LIB)
endif() endif()
@ -285,7 +287,7 @@ foreach (family ${ARCH})
if (STATIC_BUILD) if (STATIC_BUILD)
target_link_libraries(${target} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ${EXPAT_LIBRARIES}) target_link_libraries(${target} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ${EXPAT_LIBRARIES})
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND MSVC) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
else() else()
target_link_libraries(${target} LINK_PUBLIC -lutil) target_link_libraries(${target} LINK_PUBLIC -lutil)
endif() endif()