diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:37:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:37:28 (GMT) |
| commit | 823022dd2ebf1dd1fc9c492db21d9e688c5719ab (patch) | |
| tree | 7240ac97775f4124a95ad05e8f2ed3e71c291045 /Modules/Platform | |
| parent | 3e6f5ff33cf417293f2fa92e5aa5d22d2a395e65 (diff) | |
| parent | f9eee7f1833856f690b4a8ef5f5aa44d9ccb8114 (diff) | |
| download | CMake-823022dd2ebf1dd1fc9c492db21d9e688c5719ab.zip CMake-823022dd2ebf1dd1fc9c492db21d9e688c5719ab.tar.gz CMake-823022dd2ebf1dd1fc9c492db21d9e688c5719ab.tar.bz2 | |
Merge topic 'WindowsPaths-MinGW-cross-compile-only'
f9eee7f Windows: Search '/' prefix only when cross compiling (#10994)
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/WindowsPaths.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake index bd31da0..fc921d7 100644 --- a/Modules/Platform/WindowsPaths.cmake +++ b/Modules/Platform/WindowsPaths.cmake @@ -77,10 +77,12 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${_CMAKE_INSTALL_DIR}") list(APPEND CMAKE_SYSTEM_PREFIX_PATH # Project install destination. "${CMAKE_INSTALL_PREFIX}" + ) +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 ) |