summaryrefslogtreecommitdiff
path: root/Modules/Platform/UnixPaths.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-09-28 11:42:19 -0400
committerBrad King <brad.king@kitware.com>2006-09-28 11:42:19 -0400
commit506dca3990e56281bd0eecd6c26afe6d36caab6e (patch)
tree2b17e0c3d37cc9f7a86cad82abd137d6da4f3a12 /Modules/Platform/UnixPaths.cmake
parentd01b6f12819c4d8aec189ae3eebfd1779565bbf2 (diff)
downloadcmake-506dca3990e56281bd0eecd6c26afe6d36caab6e.tar.gz
BUG: Header and library search path ordering should be consistent.
Diffstat (limited to 'Modules/Platform/UnixPaths.cmake')
-rw-r--r--Modules/Platform/UnixPaths.cmake38
1 files changed, 32 insertions, 6 deletions
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index 5515a303a9..b6232e995c 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -1,6 +1,32 @@
-SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include
- /usr/local/include /usr/local /opt/local/include /usr/X11R6/include /usr/include/X11 /usr/pkg/include)
-SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} /lib /usr/lib /usr/local/lib
- /usr/lib/w32api /usr/X11R6/lib /opt/local/lib /opt/csw/lib /opt/lib /usr/pkg/lib)
-SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} /bin /usr/bin /usr/local/bin
- /usr/pkg/bin /sbin)
+SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH}
+ # Standard
+ /include /usr/include /usr/local/include
+
+ # Windows API on Cygwin
+ /usr/include/w32api
+
+ # X11
+ /usr/X11R6/include /usr/include/X11
+
+ # Other
+ /opt/local/include /usr/pkg/include
+ )
+
+SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
+ # Standard
+ /lib /usr/lib /usr/local/lib
+
+ # Windows API on Cygwin
+ /usr/lib/w32api
+
+ # X11
+ /usr/X11R6/lib /usr/lib/X11
+
+ # Other
+ /opt/local/lib /usr/pkg/lib
+ /opt/csw/lib /opt/lib
+ )
+
+SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
+ /bin /usr/bin /usr/local/bin /usr/pkg/bin /sbin
+ )