mirror of
https://github.com/monero-project/monero.git
synced 2025-02-22 17:50:20 +02:00
cmake: remove obsolete msys2 workaround
This commit is contained in:
parent
8d60021377
commit
d07f99a8dc
@ -488,19 +488,6 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
set(PIC_FLAG "-fPIC")
|
set(PIC_FLAG "-fPIC")
|
||||||
|
|
||||||
if(MINGW)
|
|
||||||
string(REGEX MATCH "^[^/]:/[^/]*" msys2_install_path "${CMAKE_C_COMPILER}")
|
|
||||||
message(STATUS "MSYS location: ${msys2_install_path}")
|
|
||||||
set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include")
|
|
||||||
# This is necessary because otherwise CMake will make Boost libraries -lfoo
|
|
||||||
# rather than a full path. Unfortunately, this makes the shared libraries get
|
|
||||||
# linked due to a bug in CMake which misses putting -static flags around the
|
|
||||||
# -lfoo arguments.
|
|
||||||
set(DEFLIB ${msys2_install_path}/mingw${ARCH_WIDTH}/lib)
|
|
||||||
list(REMOVE_ITEM CMAKE_C_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
|
|
||||||
list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(STATIC)
|
if(STATIC)
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .dll.a .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||||
|
Loading…
Reference in New Issue
Block a user