<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4eb4fe8d8fb6fd81dceec009615af3ac9f5de3a5">https://github.com/macports/macports-ports/commit/4eb4fe8d8fb6fd81dceec009615af3ac9f5de3a5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4eb4fe8 volk-devel: update to 20191206-33a29a1a
</span>4eb4fe8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4eb4fe8d8fb6fd81dceec009615af3ac9f5de3a5
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Dec 8 21:06:23 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> volk-devel: update to 20191206-33a29a1a
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add a temporary patch to fix include directory ordering so that Volk can be built while a prior version is installed in the CMAKE_INSTALL_PREFIX or some other primary system path.
</span>---
science/volk/Portfile | 14 +-
science/volk/files/patch-fix-build.devel.diff | 253 ++++++++++++++++++++++++++
2 files changed, 262 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/Portfile b/science/volk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25b75be..c5c482c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,17 +35,21 @@ provides the release version, which is typically updated every month or so.
</span>
subport volk-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk 636cb803a94728638352c1b506ab3170073e9572
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191117-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3e14116f817a4d82004e6ef4add251ada90d0af7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c3da38adaed6e500b6e567be73b25e67f96e28c22b0ab060d39624386b453476 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 267001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk 33a29a1adca94e1a86867ecca2ab171bb0458c1e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191206-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 746eb8bfe5a24ba53159ee13880a85a5b3abf133 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 10a5ed5e009a28640755d96fe56453f0e2e2a3030855bb0aa589f9a62c1a949d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 271007
</span> revision 0
conflicts volk
long_description ${long_description} ${subport} \
provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch that fixes include directory ordering and a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bunch of other related issues. It it upstream as a PR already.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-build.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# fix naming of *Clang compiler to just "Clang" for internal use
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-fix-build.devel.diff b/science/volk/files/patch-fix-build.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..352e72f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/files/patch-fix-build.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,253 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 64d4709d21a289b4e2974c5a3a856a4b5b71c1d4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Michael Dickens <michael.dickens@ettus.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun Dec 8 16:45:26 2019 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib: remove references to Boost, since it is not used herein
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modtool: remove reference to just-removed `VOLK_RUN_TESTS` macro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib: remove unnecessary quotes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apps: redo include_directories to be target_include_directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Include Boost_INCLUDE_DIRS only if not using std::filesystem .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib: various tweaks and adding verbose comments to help explain why
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apps: final Boost tweaks and ordering fix for includes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b4dc982..6a0cee8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,19 +18,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Setup profiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PROJECT_SOURCE_DIR}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PROJECT_BINARY_DIR}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MAKE volk_profile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(volk_profile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +26,29 @@ add_executable(volk_profile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/volk_option_helpers.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(${FILESYSTEM_FOUND})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(volk_profile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cmake/msvc>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(volk_profile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/lib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT FILESYSTEM_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(volk_profile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(volk_profile PRIVATE ${Boost_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(FILESYSTEM_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DHAS_STD_FILESYSTEM=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${find_experimental})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DHAS_STD_FILESYSTEM_EXPERIMENTAL=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,10 +57,10 @@ if(${FILESYSTEM_FOUND})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(volk_profile PRIVATE volk_static ${Boost_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(volk_profile PRIVATE volk_static)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(volk_profile PROPERTIES LINK_FLAGS "-static")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(volk_profile PRIVATE volk ${Boost_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(volk_profile PRIVATE volk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b167f7a..0ca3244 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -533,38 +533,52 @@ if(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#Create a volk object library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#Create an object to reference Volk source and object files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#NOTE: This object cannot be used to propagate include directories or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#library linkage, but we have to define them here for compiling to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#work. There are options starting with CMake 3.13 for using the OBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#to propagate this information.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(volk_obj OBJECT ${volk_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(volk_obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PUBLIC $<INSTALL_INTERFACE:include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/kernels>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#Configure object target properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Add dynamic library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#NOTE: The PUBLIC include directories and library linkage will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#propagated when this target is used to build other targets. Also, the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#PUBLIC library linkage and include directories INSTALL_INTERFACE will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#be used to create the target import information. Ordering of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include directories is taken as provided; it -might- matter, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#probably doesn't.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(volk ${volk_libraries})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(volk PUBLIC ${volk_libraries})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PUBLIC $<INSTALL_INTERFACE:include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/kernels>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC $<INSTALL_INTERFACE:include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Configure target properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(volk m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(volk PUBLIC m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Install locations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPORT VOLK-export
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -574,20 +588,27 @@ install(TARGETS volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Configure static library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#NOTE: The PUBLIC include directories and library linkage will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#propagated when this target is used to build other targets. Also, the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#PUBLIC library linkage and include directories INSTALL_INTERFACE will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#be used to create the target import information. Ordering of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include directories is taken as provided; it -might- matter, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#probably doesn't.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(volk_static ${volk_libraries} pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(volk_static PUBLIC ${volk_libraries} pthread)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(volk_static m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(volk_static PUBLIC m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(volk_static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PUBLIC $<INSTALL_INTERFACE:include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/kernels>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PUBLIC $<INSTALL_INTERFACE:include>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(volk_static PROPERTIES OUTPUT_NAME volk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -602,16 +623,9 @@ endif(ENABLE_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_TESTING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include Boost headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(${Boost_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make_directory(${CMAKE_CURRENT_BINARY_DIR}/.unittest)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_source_files_properties(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMPILE_DEFINITIONS "BOOST_TEST_DYN_LINK;BOOST_TEST_MAIN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(VolkAddTest)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VOLK_GEN_TEST("volk_test_all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VOLK_GEN_TEST(volk_test_all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_DEPS volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -619,7 +633,7 @@ if(ENABLE_TESTING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(kernel ${h_files})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_filename_component(kernel ${kernel} NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REPLACE ".h" "" kernel ${kernel})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VOLK_ADD_TEST(${kernel} "volk_test_all")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VOLK_ADD_TEST(${kernel} volk_test_all)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(ENABLE_TESTING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/qa_utils.h b/lib/qa_utils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bab07ca..2d8458b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/qa_utils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/qa_utils.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,14 +142,6 @@ bool run_volk_tests(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool benchmark_mode = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VOLK_RUN_TESTS(func, tol, scalar, len, iter) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOST_AUTO_TEST_CASE(func##_test) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOST_CHECK_EQUAL(run_volk_tests( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- func##_get_func_desc(), (void (*)())func##_manual, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::string(#func), tol, scalar, len, iter, 0, "NULL"), \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VOLK_PROFILE(func, test_params, results) run_volk_tests(func##_get_func_desc(), (void (*)())func##_manual, std::string(#func), test_params, results, "NULL")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VOLK_PUPPET_PROFILE(func, puppet_master_func, test_params, results) run_volk_tests(func##_get_func_desc(), (void (*)())func##_manual, std::string(#func), test_params, results, std::string(#puppet_master_func))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef void (*volk_fn_1arg)(void *, unsigned int, const char*); //one input, operate in place
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/python/volk_modtool/volk_modtool_generate.py b/python/volk_modtool/volk_modtool_generate.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3fd67d6..280a1bb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/python/volk_modtool/volk_modtool_generate.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/python/volk_modtool/volk_modtool_generate.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,6 @@ class volk_modtool(object):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.volk = re.compile('volk')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.remove_after_underscore = re.compile("_.*")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.volk_included = re.compile('INCLUDED_VOLK')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.volk_run_tests = re.compile(r'^\s*VOLK_RUN_TESTS.*\n', re.MULTILINE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.volk_profile = re.compile(r'^\s*(VOLK_PROFILE|VOLK_PUPPET_PROFILE).*\n', re.MULTILINE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.volk_kernel_tests = re.compile(r'^\s*\((VOLK_INIT_TEST|VOLK_INIT_PUPP).*\n', re.MULTILINE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.volk_null_kernel = re.compile(r'^\s*;\n', re.MULTILINE)
</span></pre><pre style='margin:0'>
</pre>