summaryrefslogtreecommitdiffstats
path: root/Modules/Platform/UnixPaths.cmake
diff options
context:
space:
mode:
authorChuck Atkins <chuck.atkins@kitware.com>2017-03-16 09:57:58 (GMT)
committerChuck Atkins <chuck.atkins@kitware.com>2017-03-16 09:57:58 (GMT)
commit7eb1f5b7aca1500e68a8be7ba158ed616a8595df (patch)
tree0face8e7138c9917192e64337e92ebbba5ac3a51 /Modules/Platform/UnixPaths.cmake
parentfb26fcb261c927687f66b556df83ff6546f9bbd9 (diff)
downloadCMake-7eb1f5b7aca1500e68a8be7ba158ed616a8595df.zip
CMake-7eb1f5b7aca1500e68a8be7ba158ed616a8595df.tar.gz
CMake-7eb1f5b7aca1500e68a8be7ba158ed616a8595df.tar.bz2
Unix: Consolidate path components into prefixes
Diffstat (limited to 'Modules/Platform/UnixPaths.cmake')
-rw-r--r--Modules/Platform/UnixPaths.cmake27
1 files changed, 11 insertions, 16 deletions
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index b216d03..11b28f8 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -41,18 +41,22 @@ if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
endif()
endif()
+# Non "standard" but common install prefixes
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+ /usr/X11R6
+ /usr/pkg
+ /opt/csw
+ /opt
+ /opt/openwin
+ )
+
# 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/X11R6/include /usr/include/X11
-
- # Other
- /usr/pkg/include
- /opt/csw/include /opt/include
- /usr/openwin/include
+ /usr/include/X11
)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
@@ -60,16 +64,7 @@ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
/usr/lib/w32api
# X11
- /usr/X11R6/lib /usr/lib/X11
-
- # Other
- /usr/pkg/lib
- /opt/csw/lib /opt/lib
- /usr/openwin/lib
- )
-
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
- /usr/pkg/bin
+ /usr/lib/X11
)
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES