diff options
| author | Josh Blum <josh@joshknows.com> | 2013-04-15 10:02:26 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2013-04-15 10:02:26 -0700 |
| commit | 3405201567c4479e97749d0b4b8862f0e8c0d055 (patch) | |
| tree | 879c5c9ff2a185acde2cbc7e7c049d8a9c0e9d43 | |
| parent | cb2473917665903ee5756aba88daf8d59f8ba137 (diff) | |
| download | uhd-3405201567c4479e97749d0b4b8862f0e8c0d055.tar.gz uhd-3405201567c4479e97749d0b4b8862f0e8c0d055.tar.bz2 uhd-3405201567c4479e97749d0b4b8862f0e8c0d055.zip | |
orc: fixed orc version check with pkg config
| -rw-r--r-- | host/cmake/Modules/FindORC.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/host/cmake/Modules/FindORC.cmake b/host/cmake/Modules/FindORC.cmake index bb212fb1b..0d9fc9ca1 100644 --- a/host/cmake/Modules/FindORC.cmake +++ b/host/cmake/Modules/FindORC.cmake @@ -3,7 +3,13 @@ ######################################################################## INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_ORC "orc-0.4 > 0.4.11") +PKG_CHECK_MODULES(PC_ORC "orc-0.4") +PKG_CHECK_MODULES(PC_ORC_V4_11 "orc-0.4 > 0.4.11") + +#we are using the pkg config as a version check +#if we have pkg config, the right version must be found +#the alternative is that no pkg config orc is found +if (PC_ORC_V4_11_FOUND OR (NOT PC_ORC_FOUND AND NOT PC_ORC_V4_11_FOUND)) FIND_PATH( ORC_INCLUDE_DIRS @@ -23,6 +29,8 @@ FIND_LIBRARY( /usr/lib ) +endif() #both PC ORC FOUND + INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ORC DEFAULT_MSG ORC_LIBRARIES ORC_INCLUDE_DIRS) MARK_AS_ADVANCED(ORC_LIBRARIES ORC_INCLUDE_DIRS) |