diff options
| author | Johnathan Corgan | 2012-03-15 14:59:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-15 14:59:40 -0700 |
| commit | 263bdb48110bc36f1d844e6b444782b2102f8326 (patch) | |
| tree | 1cad1cc1538f4672d0a8772e1305418cd11a95a3 /volk | |
| parent | 4310205cecee8f4bb22c056c9966f82b4260e169 (diff) | |
| parent | 3b81309702b17ac4042b8d4880238d1fa321b194 (diff) | |
| download | gnuradio-263bdb48110bc36f1d844e6b444782b2102f8326.tar.gz gnuradio-263bdb48110bc36f1d844e6b444782b2102f8326.tar.bz2 gnuradio-263bdb48110bc36f1d844e6b444782b2102f8326.zip | |
Merge branch 'maint'
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 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 |