From 6ea8def6f65fc52dcc4102f68377ca3c6d608bbd Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 19 Jan 2011 14:55:51 -0600 Subject: [PATCH] MacPorts & Fink paths now prepended to default search prefixes --- CMakeLists.txt | 1 + aux/binpac | 2 +- aux/bro-aux | 2 +- aux/broccoli | 2 +- aux/broctl | 2 +- cmake/MacDependencyPaths.cmake | 10 ++++++++++ 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 cmake/MacDependencyPaths.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 783efd685a..005c5aec15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}") ######################################################################## ## Dependency Configuration +include(MacDependencyPaths) include(FindRequiredPackage) # Check cache value first to avoid displaying "Found sed" messages everytime diff --git a/aux/binpac b/aux/binpac index 7bbd3b14c0..898cfd5ddc 160000 --- a/aux/binpac +++ b/aux/binpac @@ -1 +1 @@ -Subproject commit 7bbd3b14c02321ff2a63d7267e9ae022bda4f5bc +Subproject commit 898cfd5ddc8cd356e4052c0bd699e51812a91e98 diff --git a/aux/bro-aux b/aux/bro-aux index 62b2f1bdd5..d741ee2ebd 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 62b2f1bdd52d355fb0384c3f0e8f1879c7c17724 +Subproject commit d741ee2ebd6576d9329218bfb53941b4de5375b6 diff --git a/aux/broccoli b/aux/broccoli index cd02839cf0..a5dbe7a0ea 160000 --- a/aux/broccoli +++ b/aux/broccoli @@ -1 +1 @@ -Subproject commit cd02839cf07d4db34f30bbdbb41711bc8b06b1ac +Subproject commit a5dbe7a0eacd8628c1382707ae9596ad97c538aa diff --git a/aux/broctl b/aux/broctl index 798ea05965..0c96b764bf 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 798ea05965318333af4df8fe9f0296eb3a669f4f +Subproject commit 0c96b764bfef264a2f8b42363a5e090c4f65cca2 diff --git a/cmake/MacDependencyPaths.cmake b/cmake/MacDependencyPaths.cmake new file mode 100644 index 0000000000..9a8c6efc6a --- /dev/null +++ b/cmake/MacDependencyPaths.cmake @@ -0,0 +1,10 @@ +if (NOT _MAC_DEPENDENCY_PATHS) +set(_MAC_DEPENDENCY_PATHS) + # As of CMake 2.8.3, Fink and MacPorts search paths are appended to the + # default search prefix paths, but the nicer thing would be if they are + # prepended to the default, so that is fixed here. + if (APPLE) + list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 /opt/local) # MacPorts + list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 /sw) # Fink + endif () +endif ()