diff options
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/cpu.cmake | 4 | ||||
| -rw-r--r-- | src/cmake/library.cmake | 2 | ||||
| -rw-r--r-- | src/cmake/plugin.cmake | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/cmake/cpu.cmake b/src/cmake/cpu.cmake index 8ea050b4d23..bdc9014d944 100644 --- a/src/cmake/cpu.cmake +++ b/src/cmake/cpu.cmake @@ -55,7 +55,6 @@ set(VPP_LOG2_CACHE_LINE_SIZE ${VPP_LOG2_CACHE_LINE_SIZE} ############################################################################## if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") set(CMAKE_C_FLAGS "-march=corei7 -mtune=corei7-avx ${CMAKE_C_FLAGS}") - set(VPP_LIB_DIR_NAME lib64) check_c_compiler_flag("-march=core-avx2" compiler_flag_march_core_avx2) if(compiler_flag_march_core_avx2) list(APPEND MARCH_VARIANTS "avx2\;-march=core-avx2 -mtune=core-avx2") @@ -66,9 +65,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") endif() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") set(CMAKE_C_FLAGS "-march=armv8-a+crc ${CMAKE_C_FLAGS}") - set(VPP_LIB_DIR_NAME lib64) -else() - set(VPP_LIB_DIR_NAME lib) endif() macro(vpp_library_set_multiarch_sources lib) diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake index 04165ffb1e4..e0eb7af76fc 100644 --- a/src/cmake/library.cmake +++ b/src/cmake/library.cmake @@ -33,7 +33,7 @@ macro(add_vpp_library lib) endif() install( TARGETS ${lib} - DESTINATION ${VPP_LIB_DIR_NAME} + DESTINATION lib COMPONENT ${ARG_COMPONENT} ) diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake index c6f551dd3d5..39c940daed4 100644 --- a/src/cmake/plugin.cmake +++ b/src/cmake/plugin.cmake @@ -69,13 +69,13 @@ macro(add_vpp_plugin name) LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_api_test_plugins) install( TARGETS ${test_plugin_name} - DESTINATION ${VPP_LIB_DIR_NAME}/vpp_api_test_plugins + DESTINATION lib/vpp_api_test_plugins COMPONENT ${PLUGIN_COMPONENT} ) endif() install( TARGETS ${plugin_name} - DESTINATION ${VPP_LIB_DIR_NAME}/vpp_plugins + DESTINATION lib/vpp_plugins COMPONENT ${PLUGIN_COMPONENT} ) endmacro() |