diff options
| author | Tom Rondeau | 2011-10-22 14:25:13 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-22 14:25:13 -0400 |
| commit | da5563356afe3f50eb2560b5106a81776da7a43f (patch) | |
| tree | b2c9c7bb0a1e8948f2507a38e595e5cc557799d7 /volk | |
| parent | 1468be3299036606b678664ba84d0c0870266c9c (diff) | |
| parent | 31268cfb68965dbcf3df4912059f0c5b6d744626 (diff) | |
| download | gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.tar.gz gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.tar.bz2 gnuradio-da5563356afe3f50eb2560b5106a81776da7a43f.zip | |
Merge remote branch 'jblum/cmake_fixes' into next
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/gen/make_makefile_am.py | 2 | ||||
| -rw-r--r-- | volk/include/volk/volk_prefs.h | 2 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/volk/gen/make_makefile_am.py b/volk/gen/make_makefile_am.py index f843b4413..0dc088a80 100644 --- a/volk/gen/make_makefile_am.py +++ b/volk/gen/make_makefile_am.py @@ -25,8 +25,8 @@ def make_makefile_am(dom, machines, archflags_dict): include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \ - -I$(top_srcdir)/include \ -I$(top_gendir)/include \ + -I$(top_srcdir)/include \ -Dvolk_EXPORTS \ -fvisibility=hidden \ $(WITH_INCLUDES) diff --git a/volk/include/volk/volk_prefs.h b/volk/include/volk/volk_prefs.h index 2a7f7e79f..83d9baf89 100644 --- a/volk/include/volk/volk_prefs.h +++ b/volk/include/volk/volk_prefs.h @@ -5,7 +5,7 @@ __VOLK_DECL_BEGIN -struct VOLK_API volk_arch_pref { +struct volk_arch_pref { char name[128]; char arch[32]; }; diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index f4177b16e..e18d13677 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -231,10 +231,10 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32) endif() include_directories( - ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ) list(APPEND volk_sources |