diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-03-19 13:56:21 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-03-19 13:56:21 -0400 |
| commit | abc796707426337f408166b44251c6ca1bc5d20f (patch) | |
| tree | 1caa54fc3ceb57be2fc572a7546588a32b2c4c2b /volk | |
| parent | b05ac49ced6a9b4cd4e4ba2d0a3ed74b6979dcc8 (diff) | |
| parent | 77834b2dcf0f4b06f07a5f143e70e21160eae88e (diff) | |
Merge branch 'master' into next
Conflicts:
volk/config/orc.m4
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/cmake/FindORC.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/volk/cmake/FindORC.cmake b/volk/cmake/FindORC.cmake index 8d8c2d13e9..1c4c417add 100644 --- a/volk/cmake/FindORC.cmake +++ b/volk/cmake/FindORC.cmake @@ -1,5 +1,5 @@ FIND_PACKAGE(PkgConfig) -PKG_CHECK_MODULES(PC_ORC orc-0.4) +PKG_CHECK_MODULES(PC_ORC "orc-0.4 > 0.4.11") |