From a2894f6ad7d9cc79a343cc0b06e9fc23994c5c09 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 5 Nov 2011 14:33:39 -0700
Subject: volk: work to improve compiler and multi-lib support

---
 volk/cmake/FindORC.cmake | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 volk/cmake/FindORC.cmake

(limited to 'volk/cmake/FindORC.cmake')

diff --git a/volk/cmake/FindORC.cmake b/volk/cmake/FindORC.cmake
new file mode 100644
index 000000000..8d8c2d13e
--- /dev/null
+++ b/volk/cmake/FindORC.cmake
@@ -0,0 +1,36 @@
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_ORC orc-0.4)
+
+
+
+
+FIND_PROGRAM(ORCC_EXECUTABLE orcc
+             HINTS ${PC_ORC_TOOLSDIR}
+	     PATHS ${ORC_ROOT}/bin ${CMAKE_INSTALL_PREFIX}/bin)
+
+FIND_PATH(ORC_INCLUDE_DIR NAMES orc/orc.h 
+          HINTS ${PC_ORC_INCLUDEDIR}
+	  PATHS ${ORC_ROOT}/include/orc-0.4 ${CMAKE_INSTALL_PREFIX}/include/orc-0.4)
+
+
+FIND_PATH(ORC_LIBRARY_DIR NAMES ${CMAKE_SHARED_LIBRARY_PREFIX}orc-0.4${CMAKE_SHARED_LIBRARY_SUFFIX} 
+          HINTS ${PC_ORC_LIBDIR}
+	  PATHS ${ORC_ROOT}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+FIND_LIBRARY(ORC_LIB orc-0.4 
+             HINTS ${PC_ORC_LIBRARY_DIRS}
+	     PATHS ${ORC_ROOT}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+LIST(APPEND ORC_LIBRARY
+     ${ORC_LIB}
+)
+
+
+SET(ORC_INCLUDE_DIRS ${ORC_INCLUDE_DIR})
+SET(ORC_LIBRARIES ${ORC_LIBRARY})
+SET(ORC_LIBRARY_DIRS ${ORC_LIBRARY_DIR})
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ORC "orc files" ORC_LIBRARY ORC_INCLUDE_DIR ORCC_EXECUTABLE)
+
+mark_as_advanced(ICE_INCLUDE_DIR ICE_LIBRARY ORCC_EXECUTABLE)
-- 
cgit 


From c9ff4b288d981780dbb6e0bb5fc304997cadc2b1 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Mon, 19 Mar 2012 13:54:43 -0400
Subject: volk: change minimum acceptable ORC version to 4.12 (in cmake and
 updating version in autotools).

---
 volk/cmake/FindORC.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'volk/cmake/FindORC.cmake')

diff --git a/volk/cmake/FindORC.cmake b/volk/cmake/FindORC.cmake
index 8d8c2d13e..1c4c417ad 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")
 
 
 
-- 
cgit 


From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Fri, 13 Apr 2012 18:36:53 -0400
Subject: Removed whitespace and added dtools/bin/remove-whitespace as a tool
 to do this in the future.

The sed script was provided by Moritz Fischer.
---
 volk/cmake/FindORC.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'volk/cmake/FindORC.cmake')

diff --git a/volk/cmake/FindORC.cmake b/volk/cmake/FindORC.cmake
index 1c4c417ad..a5f35c465 100644
--- a/volk/cmake/FindORC.cmake
+++ b/volk/cmake/FindORC.cmake
@@ -8,16 +8,16 @@ FIND_PROGRAM(ORCC_EXECUTABLE orcc
              HINTS ${PC_ORC_TOOLSDIR}
 	     PATHS ${ORC_ROOT}/bin ${CMAKE_INSTALL_PREFIX}/bin)
 
-FIND_PATH(ORC_INCLUDE_DIR NAMES orc/orc.h 
+FIND_PATH(ORC_INCLUDE_DIR NAMES orc/orc.h
           HINTS ${PC_ORC_INCLUDEDIR}
 	  PATHS ${ORC_ROOT}/include/orc-0.4 ${CMAKE_INSTALL_PREFIX}/include/orc-0.4)
 
 
-FIND_PATH(ORC_LIBRARY_DIR NAMES ${CMAKE_SHARED_LIBRARY_PREFIX}orc-0.4${CMAKE_SHARED_LIBRARY_SUFFIX} 
+FIND_PATH(ORC_LIBRARY_DIR NAMES ${CMAKE_SHARED_LIBRARY_PREFIX}orc-0.4${CMAKE_SHARED_LIBRARY_SUFFIX}
           HINTS ${PC_ORC_LIBDIR}
 	  PATHS ${ORC_ROOT}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 
-FIND_LIBRARY(ORC_LIB orc-0.4 
+FIND_LIBRARY(ORC_LIB orc-0.4
              HINTS ${PC_ORC_LIBRARY_DIRS}
 	     PATHS ${ORC_ROOT}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 
-- 
cgit