diff options
| author | Brad King <brad.king@kitware.com> | 2010-08-31 18:16:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-09-01 12:50:51 (GMT) |
| commit | eae45a67e7901b9b5531a4cd49e9716e8edb3956 (patch) | |
| tree | 953f1c998c22a44f0605cca3ad16794c54514490 | |
| parent | 81a76fedd7abdbc8ce840ff7c8ecc7a8c68e26bf (diff) | |
| download | CMake-eae45a67e7901b9b5531a4cd49e9716e8edb3956.zip CMake-eae45a67e7901b9b5531a4cd49e9716e8edb3956.tar.gz CMake-eae45a67e7901b9b5531a4cd49e9716e8edb3956.tar.bz2 | |
Search MacPorts /opt/local prefix on Mac
Include this prefix in CMAKE_SYSTEM_PREFIX_PATH so that it will be used
for all find* commands. Previously only find_library and find_path
would look under /opt/local/lib and /opt/local/include, respectively.
| -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 ) |