summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorChuck Atkins <chuck.atkins@kitware.com>2017-03-16 10:04:29 (GMT)
committerChuck Atkins <chuck.atkins@kitware.com>2017-03-16 10:04:29 (GMT)
commit0b668e52a91b7f03f312c691e5b1c54a371d0316 (patch)
treeb0f20e9d845b466c5513f1e9115c7aab591b47e9 /Modules
parent2a8c2af4d4ca1ec653c87c11a3f79a241b6b27e7 (diff)
downloadCMake-0b668e52a91b7f03f312c691e5b1c54a371d0316.zip
CMake-0b668e52a91b7f03f312c691e5b1c54a371d0316.tar.gz
CMake-0b668e52a91b7f03f312c691e5b1c54a371d0316.tar.bz2
Cygwin: Move Cygwin-specific paths to the cygwin platform
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/CYGWIN.cmake10
-rw-r--r--Modules/Platform/UnixPaths.cmake6
2 files changed, 10 insertions, 6 deletions
diff --git a/Modules/Platform/CYGWIN.cmake b/Modules/Platform/CYGWIN.cmake
index 22816e7..9b897bd 100644
--- a/Modules/Platform/CYGWIN.cmake
+++ b/Modules/Platform/CYGWIN.cmake
@@ -62,3 +62,13 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a")
set(CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION 1)
include(Platform/UnixPaths)
+
+# Windows API on Cygwin
+list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+ /usr/include/w32api
+ )
+
+# Windows API on Cygwin
+list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+ /usr/lib/w32api
+ )
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 48bbd40..89f7d87 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -50,17 +50,11 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
# List common include file locations not under the common prefixes.
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
- # Windows API on Cygwin
- /usr/include/w32api
-
# X11
/usr/include/X11
)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
- # Windows API on Cygwin
- /usr/lib/w32api
-
# X11
/usr/lib/X11
)