diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-08 15:07:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-08 15:07:59 (GMT) |
| commit | 2079424568d92b97bb4f56340271bd924f64722c (patch) | |
| tree | c45a8fd03260159ee4254e4393aeb0200f0861c7 /Modules/Platform | |
| parent | 4ea441eaf9a7a5dda266db9a6862fc9f8ed1c8cc (diff) | |
| parent | eae45a67e7901b9b5531a4cd49e9716e8edb3956 (diff) | |
| download | CMake-2079424568d92b97bb4f56340271bd924f64722c.zip CMake-2079424568d92b97bb4f56340271bd924f64722c.tar.gz CMake-2079424568d92b97bb4f56340271bd924f64722c.tar.bz2 | |
Merge topic 'find-macports'
eae45a6 Search MacPorts /opt/local prefix on Mac
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 5 | ||||
| -rw-r--r-- | Modules/Platform/UnixPaths.cmake | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index c8bcad1..db0642e 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -235,4 +235,7 @@ SET(CMAKE_SYSTEM_APPBUNDLE_PATH /Developer/Applications) INCLUDE(Platform/UnixPaths) -LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /sw) +LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH + /sw # Fink + /opt/local # MacPorts + ) diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index ae3c187..5ee7ddb 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -51,7 +51,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /usr/X11R6/include /usr/include/X11 # Other - /opt/local/include /usr/pkg/include + /usr/pkg/include /opt/csw/include /opt/include /usr/openwin/include ) @@ -64,7 +64,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /usr/X11R6/lib /usr/lib/X11 # Other - /opt/local/lib /usr/pkg/lib + /usr/pkg/lib /opt/csw/lib /opt/lib /usr/openwin/lib ) |