From 1eade7157981c9bcf4e07e82fa9c7a78bda1929b Mon Sep 17 00:00:00 2001 From: Mikhail Kashkarov Date: Wed, 23 Oct 2019 19:07:55 +0300 Subject: [PATCH] [cmake] Explicitly specify target dependencies to allow build in parallel Change-Id: Ic53fb6c0ac0b53530fb463a9d1620fab85e55877 Signed-off-by: Mikhail Kashkarov --- bt-httpproxy/CMakeLists.txt | 2 +- bt-oal/haltest/CMakeLists.txt | 3 +-- bt-otp/CMakeLists.txt | 2 +- bt-service-adaptation/CMakeLists.txt | 2 +- packaging/bluetooth-frwk.spec | 6 +++--- test/CMakeLists.txt | 4 +--- test/gatt-test/CMakeLists.txt | 2 +- test/le-adv/CMakeLists.txt | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bt-httpproxy/CMakeLists.txt b/bt-httpproxy/CMakeLists.txt index fe07122..25acae1 100644 --- a/bt-httpproxy/CMakeLists.txt +++ b/bt-httpproxy/CMakeLists.txt @@ -36,7 +36,7 @@ ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_HPS") ADD_DEFINITIONS("-DHPS_GATT_DB") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hps_pkgs_LDFLAGS} -L${CMAKE_CURRENT_SOURCE_DIR}/../bt-api -lbluetooth-api) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${hps_pkgs_LDFLAGS} bluetooth-api) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.httpproxy.service DESTINATION share/dbus-1/system-services) diff --git a/bt-oal/haltest/CMakeLists.txt b/bt-oal/haltest/CMakeLists.txt index 1bec381..a725fa7 100644 --- a/bt-oal/haltest/CMakeLists.txt +++ b/bt-oal/haltest/CMakeLists.txt @@ -48,8 +48,7 @@ TARGET_LINK_LIBRARIES(${TARGET_GTEST_TESTS} ${oal_pkgs_LIBRARIES} gmock capi-system-info - -L${CMAKE_SOURCE_DIR}/bt-oal - -lbt-oal + bt-oal ) INSTALL(TARGETS ${TARGET_GTEST_TESTS} DESTINATION /usr/bin) diff --git a/bt-otp/CMakeLists.txt b/bt-otp/CMakeLists.txt index 93164df..dbf1ef6 100644 --- a/bt-otp/CMakeLists.txt +++ b/bt-otp/CMakeLists.txt @@ -37,7 +37,7 @@ FIND_PROGRAM(DBUS_BINDING_TOOL NAMES dbus-binding-tool) SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${otp_pkgs_LDFLAGS} -L${CMAKE_CURRENT_SOURCE_DIR}/../bt-api -lbluetooth-api -ldl) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${otp_pkgs_LDFLAGS} bluetooth-api -ldl) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.otp.service DESTINATION share/dbus-1/system-services) diff --git a/bt-service-adaptation/CMakeLists.txt b/bt-service-adaptation/CMakeLists.txt index 85fa87d..d8c3e44 100644 --- a/bt-service-adaptation/CMakeLists.txt +++ b/bt-service-adaptation/CMakeLists.txt @@ -120,7 +120,7 @@ ADD_DEFINITIONS("-DTIZEN_FEATURE_BT_DPM") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${service_pkgs_LDFLAGS} -lbt-oal -ldl) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${service_pkgs_LDFLAGS} bt-oal -ldl) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service DESTINATION share/dbus-1/system-services) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec index 5ce4954..707294e 100644 --- a/packaging/bluetooth-frwk.spec +++ b/packaging/bluetooth-frwk.spec @@ -290,7 +290,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DTZ_SYS_DEFAULT_USER=%TZ_SYS_DEFAULT_USER \ -DLIBNOTIFY_SUPPORT=Off \ -DLIBNOTIFICATION_SUPPORT=Off -make +make %{?_smp_mflags} %cmake @@ -312,7 +312,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DTZ_SYS_DEFAULT_USER=%TZ_SYS_DEFAULT_USER \ -DLIBNOTIFY_SUPPORT=Off \ -DLIBNOTIFICATION_SUPPORT=Off -make +make %{?_smp_mflags} %cmake @@ -342,7 +342,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DTZ_SYS_DEFAULT_USER=%TZ_SYS_DEFAULT_USER \ -DLIBNOTIFY_SUPPORT=Off \ -DLIBNOTIFICATION_SUPPORT=Off -make +make %{?_smp_mflags} %cmake diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 84eb9f0..edb5714 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -29,9 +29,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${package_LDFLAGS} --L${CMAKE_CURRENT_SOURCE_DIR}/../bt-api --lbluetooth-api) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${package_LDFLAGS} bluetooth-api) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/test/gatt-test/CMakeLists.txt b/test/gatt-test/CMakeLists.txt index 4b6eff6..4c0064b 100644 --- a/test/gatt-test/CMakeLists.txt +++ b/test/gatt-test/CMakeLists.txt @@ -28,6 +28,6 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${package_LDFLAGS} -L${CMAKE_CURRENT_SOURCE_DIR}/../../bt-api -lbluetooth-api) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${package_LDFLAGS} bluetooth-api) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/test/le-adv/CMakeLists.txt b/test/le-adv/CMakeLists.txt index d55ce1d..edf768c 100644 --- a/test/le-adv/CMakeLists.txt +++ b/test/le-adv/CMakeLists.txt @@ -28,6 +28,6 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${package_LDFLAGS} -L${CMAKE_CURRENT_SOURCE_DIR}/../../bt-api -lbluetooth-api) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${package_LDFLAGS} bluetooth-api) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -- 2.7.4