Merge topic 'WindowsPaths-MinGW-cross-compile-only'
f9eee7f
Windows: Search '/' prefix only when cross compiling (#10994)
This commit is contained in:
commit
823022dd2e
|
@ -77,11 +77,13 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${_CMAKE_INSTALL_DIR}")
|
||||||
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||||
# Project install destination.
|
# Project install destination.
|
||||||
"${CMAKE_INSTALL_PREFIX}"
|
"${CMAKE_INSTALL_PREFIX}"
|
||||||
|
|
||||||
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
|
||||||
/
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
||||||
|
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
||||||
|
list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||||||
|
endif()
|
||||||
|
|
||||||
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue