diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-15 15:00:04 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-15 15:00:04 -0700 |
| commit | c4c985b2aed889bc49a4e30b1e8866bb214b03a2 (patch) | |
| tree | 615b2c17ac44c4baca4652a66d23c8b29fb55af8 /volk | |
| parent | 2de96be2ce56dc258714fcb2ef87e8cda03f72f7 (diff) | |
| parent | 263bdb48110bc36f1d844e6b444782b2102f8326 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/lib/CMakeLists.txt | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 00d8660ab5..b491f94bbb 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 |