Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vlib: add flag to explicitelly mark nodes which can init per-node packet trace
[vpp.git]
/
src
/
plugins
/
marvell
/
CMakeLists.txt
diff --git
a/src/plugins/marvell/CMakeLists.txt
b/src/plugins/marvell/CMakeLists.txt
index
283a1aa
..
4e4b768
100644
(file)
--- a/
src/plugins/marvell/CMakeLists.txt
+++ b/
src/plugins/marvell/CMakeLists.txt
@@
-11,22
+11,30
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-message("-- Looking for Marvell musdk")
-find_path(MUSDK_INCLUDE_DIR NAMES marvell/pp2/pp2.h)
-find_library(MUSDK_LIB NAMES musdk)
+if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)")
+ return()
+endif()
+
+find_path(MUSDK_INCLUDE_DIR NAMES mv_std.h)
+find_library(MUSDK_LIB NAMES libmusdk.a)
if(MUSDK_INCLUDE_DIR AND MUSDK_LIB)
if(MUSDK_INCLUDE_DIR AND MUSDK_LIB)
- add_vpp_plugin(marvell_plugin
- marvell.api
+ get_filename_component(MUSDK_LIB_DIR ${MUSDK_LIB} DIRECTORY)
+ set(MUSDK_LINK_FLAGS "-Wl,--whole-archive,${MUSDK_LIB_DIR}/libmusdk.a,--no-whole-archive")
+ add_vpp_plugin(marvell
+ SOURCES
plugin.c
pp2/cli.c
pp2/format.c
pp2/input.c
pp2/output.c
pp2/pp2.c
plugin.c
pp2/cli.c
pp2/format.c
pp2/input.c
pp2/output.c
pp2/pp2.c
+
+ LINK_FLAGS
+ ${MUSDK_LINK_FLAGS}
)
include_directories(${MUSDK_INCLUDE_DIR})
)
include_directories(${MUSDK_INCLUDE_DIR})
- message(
"-- Looking for Marvell musdk - found
")
+ message(
STATUS "Found Marvel MUSDK in ${MUSDK_INCLUDE_DIR}
")
else()
else()
- message(
"-- Looking for Marvell musdk -
not found - marvell_plugin disabled")
+ message(
WARNING "Marvell MUSDK
not found - marvell_plugin disabled")
endif()
endif()