Browse Source

Merge topic 'find-macports'

eae45a6 Search MacPorts /opt/local prefix on Mac
Brad King 15 years ago
parent
commit
2079424568
2 changed files with 6 additions and 3 deletions
  1. 4 1
      Modules/Platform/Darwin.cmake
  2. 2 2
      Modules/Platform/UnixPaths.cmake

+ 4 - 1
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
+  )

+ 2 - 2
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
   )