diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-20 14:15:25 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-20 14:15:25 -0700 |
| commit | dfe18fee44d1c03af186aeacd2adc97b6b129297 (patch) | |
| tree | 8b5e9def3dd49791962b13bec48c9249aa845666 | |
| parent | ab6f8142da17ee70effd469f20a41821b4bc4513 (diff) | |
volk: give priority to generated includes (helps with dirty tree)
| -rw-r--r-- | volk/gen/make_makefile_am.py | 2 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/volk/gen/make_makefile_am.py b/volk/gen/make_makefile_am.py index f843b44132..0dc088a80b 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/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index f4177b16eb..e18d136775 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 |