From: Daniel Xu <dxu@dxuuu.xyz>
Date: Wed, 30 Jun 2021 22:42:12 +0000 (-0700)
Subject: cmake: Move bpf-static and bpf-shared targets lower in file
X-Git-Tag: v0.21.0~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9686dcba515e786971518e79c080a278efc890fb;p=platform%2Fupstream%2Fbcc.git

cmake: Move bpf-static and bpf-shared targets lower in file

Move the definitions lower in the file so we can reuse some variables in
the next commit.
---

diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
index 09e5218b..1441f406 100644
--- a/src/cc/CMakeLists.txt
+++ b/src/cc/CMakeLists.txt
@@ -60,15 +60,6 @@ if(NOT CMAKE_USE_LIBBPF_PACKAGE)
   set(libbpf_uapi libbpf/include/uapi/linux/)
 endif()
 
-add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources})
-set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf)
-add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources})
-set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
-set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf)
-if(CMAKE_USE_LIBBPF_PACKAGE AND LIBBPF_FOUND)
-  target_link_libraries(bpf-shared ${LIBBPF_LIBRARIES})
-endif()
-
 set(bcc_common_sources bcc_common.cc bpf_module.cc bcc_btf.cc exported_files.cc)
 if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6)
   set(bcc_common_sources ${bcc_common_sources} bcc_debug.cc)
@@ -110,6 +101,15 @@ set_target_properties(bcc-static PROPERTIES OUTPUT_NAME bcc)
 set(bcc-lua-static
   ${bcc_common_sources} ${bcc_table_sources} ${bcc_sym_sources} ${bcc_util_sources})
 
+add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources})
+set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf)
+add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources})
+set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
+set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf)
+if(CMAKE_USE_LIBBPF_PACKAGE AND LIBBPF_FOUND)
+  target_link_libraries(bpf-shared ${LIBBPF_LIBRARIES})
+endif()
+
 include(clang_libs)
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${clang_lib_exclude_flags}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_flags}")