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/CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'volk/CMakeLists.txt')

diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
index 4b8fda059..2423fc922 100644
--- a/volk/CMakeLists.txt
+++ b/volk/CMakeLists.txt
@@ -32,14 +32,14 @@ set(LIBVER 0.0.0)
 
 set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
 set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
-
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) #location for custom "Modules"
 ########################################################################
 # Dependencies setup
 ########################################################################
-find_package(PythonInterp)
-if(NOT PYTHONINTERP_FOUND)
-    message(FATAL_ERROR "Python interpreter required by the build system.")
-endif(NOT PYTHONINTERP_FOUND)
+find_package(PythonInterp REQUIRED PYTHON_EXECUTABLE)
+find_package(Boost COMPONENTS unit_test_framework)
+find_package(ORC)
+
 
 ########################################################################
 # Setup the package config file
-- 
cgit 


From 1fe474ce91b5a4e6281e9ae1b78c87f1e2b72ccd Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 5 Nov 2011 16:20:27 -0700
Subject: volk: building on msvc again with sse2 arch

---
 volk/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'volk/CMakeLists.txt')

diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
index 2423fc922..41d5723ab 100644
--- a/volk/CMakeLists.txt
+++ b/volk/CMakeLists.txt
@@ -33,6 +33,7 @@ set(LIBVER 0.0.0)
 set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
 set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) #location for custom "Modules"
+
 ########################################################################
 # Dependencies setup
 ########################################################################
-- 
cgit 


From 24d572bc56f265f99b1994cd031df6bd15607ff3 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 6 Nov 2011 09:11:10 -0800
Subject: volk: added some environment setup stuff

---
 volk/CMakeLists.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'volk/CMakeLists.txt')

diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
index 41d5723ab..fdde308ad 100644
--- a/volk/CMakeLists.txt
+++ b/volk/CMakeLists.txt
@@ -34,6 +34,23 @@ set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-proje
 set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) #location for custom "Modules"
 
+########################################################################
+# Environment setup
+########################################################################
+IF(NOT DEFINED BOOST_ROOT)
+    SET(BOOST_ROOT "")
+ENDIF()
+SET(BOOST_ROOT ${BOOST_ROOT} CACHE STRING "Modify search path for Boost components")
+
+#after caching user-defined value, make sure to add the install prefix
+SET(BOOST_ROOT ${BOOST_ROOT}:${CMAKE_INSTALL_PREFIX})
+
+IF(NOT DEFINED CROSSCOMPILE_MULTILIB)
+    SET(CROSSCOMPILE_MULTILIB "")
+ENDIF()
+SET(CROSSCOMPILE_MULTILIB ${CROSSCOMPILE_MULTILIB} CACHE STRING "Define \"true\" if you have and want to use multiple C development libs installed for cross compile")
+
+
 ########################################################################
 # Dependencies setup
 ########################################################################
-- 
cgit