Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MacPorts & Fink paths now prepended to default search prefixes

Browse source
This commit is contained in:
Jon Siwek 2011-01-19 14:55:51 -06:00
parent aa0691ba21
commit 6ea8def6f6
6 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -57,6 +57,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}")
######################################################################## ########################################################################
## Dependency Configuration ## Dependency Configuration
include(MacDependencyPaths)
include(FindRequiredPackage) include(FindRequiredPackage)
# Check cache value first to avoid displaying "Found sed" messages everytime # Check cache value first to avoid displaying "Found sed" messages everytime

2
aux/binpac

@ -1 +1 @@
Subproject commit 7bbd3b14c02321ff2a63d7267e9ae022bda4f5bc Subproject commit 898cfd5ddc8cd356e4052c0bd699e51812a91e98

2
aux/bro-aux

@ -1 +1 @@
Subproject commit 62b2f1bdd52d355fb0384c3f0e8f1879c7c17724 Subproject commit d741ee2ebd6576d9329218bfb53941b4de5375b6

2
aux/broccoli

@ -1 +1 @@
Subproject commit cd02839cf07d4db34f30bbdbb41711bc8b06b1ac Subproject commit a5dbe7a0eacd8628c1382707ae9596ad97c538aa

2
aux/broctl

@ -1 +1 @@
Subproject commit 798ea05965318333af4df8fe9f0296eb3a669f4f Subproject commit 0c96b764bfef264a2f8b42363a5e090c4f65cca2

10
cmake/MacDependencyPaths.cmake Normal file
View file

@ -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 ()