From 5a22236b65947b88b06fd9f8cb9c12343182c815 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Thu, 2 Mar 2017 15:06:00 +0900 Subject: [PATCH] Fix the build scripts to be sure that each dummy uses its own pkg check parameter Change-Id: I323f97c05a5204ba1b924bd017595eac370c6a31 Signed-off-by: Mu-Woong Lee --- src/client-dummy/CMakeLists.txt | 6 +++--- src/server-dummy/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client-dummy/CMakeLists.txt b/src/client-dummy/CMakeLists.txt index f293fd7..f247700 100644 --- a/src/client-dummy/CMakeLists.txt +++ b/src/client-dummy/CMakeLists.txt @@ -6,14 +6,14 @@ FILE(GLOB_RECURSE SRCS *.cpp) MESSAGE("Sources: ${SRCS}") INCLUDE(FindPkgConfig) -pkg_check_modules(PKG_CLIENT REQUIRED ${DEPS}) +pkg_check_modules(PKG_CLIENT_DUMMY REQUIRED ${DEPS}) -FOREACH(flag ${PKG_CLIENT_CFLAGS}) +FOREACH(flag ${PKG_CLIENT_DUMMY_CFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") ENDFOREACH(flag) ADD_LIBRARY(${target} SHARED ${SRCS}) -TARGET_LINK_LIBRARIES(${target} ${PKG_CLIENT_LDFLAGS}) +TARGET_LINK_LIBRARIES(${target} ${PKG_CLIENT_DUMMY_LDFLAGS}) SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER}) SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) diff --git a/src/server-dummy/CMakeLists.txt b/src/server-dummy/CMakeLists.txt index 211ad0e..d5a3a4d 100644 --- a/src/server-dummy/CMakeLists.txt +++ b/src/server-dummy/CMakeLists.txt @@ -6,14 +6,14 @@ FILE(GLOB_RECURSE SRCS *.cpp) MESSAGE("Sources: ${SRCS}") INCLUDE(FindPkgConfig) -pkg_check_modules(PKG_SERVER REQUIRED ${DEPS}) +pkg_check_modules(PKG_SERVER_DUMMY REQUIRED ${DEPS}) -FOREACH(flag ${PKG_SERVER_CFLAGS}) +FOREACH(flag ${PKG_SERVER_DUMMY_CFLAGS}) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") ENDFOREACH(flag) ADD_LIBRARY(${target} SHARED ${SRCS}) -TARGET_LINK_LIBRARIES(${target} ${PKG_SERVER_LDFLAGS}) +TARGET_LINK_LIBRARIES(${target} ${PKG_SERVER_DUMMY_LDFLAGS}) SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER}) SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER}) -- 2.7.4