Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: basic fifo-tuning-logic
[vpp.git]
/
src
/
cmake
/
library.cmake
diff --git
a/src/cmake/library.cmake
b/src/cmake/library.cmake
index
0d1e97c
..
dc14ae5
100644
(file)
--- a/
src/cmake/library.cmake
+++ b/
src/cmake/library.cmake
@@
-20,7
+20,9
@@
macro(add_vpp_library lib)
)
add_library(${lib} SHARED ${ARG_SOURCES})
)
add_library(${lib} SHARED ${ARG_SOURCES})
- target_compile_options(${lib} PRIVATE -Wall)
+ if(VPP_LIB_VERSION)
+ set_target_properties(${lib} PROPERTIES SOVERSION ${VPP_LIB_VERSION})
+ endif()
# library deps
if(ARG_LINK_LIBRARIES)
# library deps
if(ARG_LINK_LIBRARIES)
@@
-32,7
+34,7
@@
macro(add_vpp_library lib)
endif()
install(
TARGETS ${lib}
endif()
install(
TARGETS ${lib}
- DESTINATION
${VPP_LIB_DIR_NAME}
+ DESTINATION
lib
COMPONENT ${ARG_COMPONENT}
)
COMPONENT ${ARG_COMPONENT}
)
@@
-41,11
+43,13
@@
macro(add_vpp_library lib)
endif()
if(ARG_API_FILES)
endif()
if(ARG_API_FILES)
- vpp_add_api_files(${lib} ${ARG_API_FILES})
+ vpp_add_api_files(${lib}
core vpp
${ARG_API_FILES})
foreach(file ${ARG_API_FILES})
get_filename_component(dir ${file} DIRECTORY)
install(
foreach(file ${ARG_API_FILES})
get_filename_component(dir ${file} DIRECTORY)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
+ FILES ${file} ${CMAKE_CURRENT_BINARY_DIR}/${file}.h
+ ${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h
+ ${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h
DESTINATION include/${lib}/${dir}
COMPONENT vpp-dev
)
DESTINATION include/${lib}/${dir}
COMPONENT vpp-dev
)
@@
-63,7
+67,7
@@
macro(add_vpp_library lib)
install(
FILES ${file}
DESTINATION include/${lib}/${dir}
install(
FILES ${file}
DESTINATION include/${lib}/${dir}
- COMPONENT
vpp
-dev
+ COMPONENT
${ARG_COMPONENT}
-dev
)
endforeach()
endif()
)
endforeach()
endif()
@@
-75,6
+79,10
@@
endmacro()
function (add_vpp_headers path)
foreach(file ${ARGN})
get_filename_component(dir ${file} DIRECTORY)
function (add_vpp_headers path)
foreach(file ${ARGN})
get_filename_component(dir ${file} DIRECTORY)
- install(FILES ${file} DESTINATION include/${path}/${dir})
+ install(
+ FILES ${file}
+ DESTINATION include/${path}/${dir}
+ COMPONENT vpp-dev
+ )
endforeach()
endfunction()
endforeach()
endfunction()