diff options
| author |   YohanPipereau <ypiperea@cisco.com> | 2019-03-12 14:15:26 +0100 |
|---|---|---|
| committer |   Hongjun Ni <hongjun.ni@intel.com> | 2019-03-18 00:51:36 +0000 |
| commit | d7680154981c54989bcbcab81173791dc1805512 (patch) | |
| tree | 5a1e807c0cb91d478eca43d0f673daa4006fa124 /src/cmake/FindVPP.cmake | |
| parent | f8118bf32a5e5276f796c3f03095c2ee1a41423a (diff) | |
Fix Cmake build environment and harden Warnings
-Remove unused sweetcomb CmakeList.txt Warnings
-Add more Warnings to plugins, scvpp and gNMI Cmake projects
-Remove unused/useless Cmake options in CmakeList files & add comments
-Improve gNMI CMakeList.txt and make it independant of a gRPC cmake build for
later package integration.
-Add FindGRPC.cmake
-Remove the use of CXX17 variant and use a dedicated Cmake module for
gRPC
Change-Id: Iafa3c031d12802e8d8c914cbce6b119c2a5c4800
Signed-off-by: Yohan Pipereau <ypiperea@cisco.com>
Diffstat (limited to 'src/cmake/FindVPP.cmake')
| -rw-r--r-- | src/cmake/FindVPP.cmake | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/cmake/FindVPP.cmake b/src/cmake/FindVPP.cmake index 3f229dc..afc1520 100644 --- a/src/cmake/FindVPP.cmake +++ b/src/cmake/FindVPP.cmake @@ -1,11 +1,3 @@ -# - Try to find LibVPP -# Once done this will define -# -# VPP_FOUND - system has VPP -# VPP_INCLUDE_DIRS - the VPP include directory -# VPP_LIBRARIES - Link these to use LibSSH -# - # # Copyright (c) 2018 PANTHEON.tech. # @@ -20,7 +12,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + + +# - Try to find LibVPP +# Once done this will define # +# VPP_FOUND - system has VPP +# VPP_INCLUDE_DIRS - the VPP include directory +# VPP_LIBRARIES - Link these to use LibSSH if (VPP_LIBRARIES AND VPP_INCLUDE_DIRS) @@ -159,16 +158,6 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS) ${CMAKE_INSTALL_PREFIX}/lib ) -# find_library(VOM_LIBRARY -# NAMES -# vom -# libvom -# PATHS -# ${VPP_LIBRARY_PATH} -# ${CMAKE_LIBRARY_PATH} -# ${CMAKE_INSTALL_PREFIX}/lib -# ) - if (VPP_INCLUDE_DIR AND VPP_LIBRARY) set(VPP_FOUND TRUE) else (VPP_INCLUDE_DIR AND VPP_LIBRARY) @@ -191,7 +180,6 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS) ${VLIB_LIBRARY} ${VATPLUGIN_LIBRARY} ${VAPI_LIBRARY} -# ${VOM_LIBRARY} ) # show the VPP_INCLUDE_DIRS and VPP_LIBRARIES variables only in the advanced view |