From 3b81309702b17ac4042b8d4880238d1fa321b194 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 15 Mar 2012 14:48:57 -0700
Subject: volk: set local includes first for precedence

---
 volk/lib/CMakeLists.txt | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'volk')

diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 00d8660ab..b491f94bb 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -254,13 +254,18 @@ add_custom_command(
 )
 
 ########################################################################
-# Handle orc support
+# Set local include directories first
 ########################################################################
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+    ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
-
-
-
-
+########################################################################
+# Handle orc support
+########################################################################
 if(ORC_FOUND)
     #setup orc library usage
     include_directories(${ORC_INCLUDE_DIRS})
@@ -294,13 +299,6 @@ if(NOT WIN32)
     add_definitions(-fvisibility=hidden)
 endif()
 
-include_directories(
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 list(APPEND volk_sources
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_prefs.c
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_rank_archs.c
-- 
cgit