From e92c1f88d6dbd1d8dd955f198b5cc47b58688c57 Mon Sep 17 00:00:00 2001 From: "Bachtin, Dmitri" Date: Fri, 20 Nov 2015 07:34:36 +0100 Subject: [PATCH] build: added _library suffix to lib variables It is a convention under CMake to suffix variables in the FIND_LIBRARY calls with _LIBRARY. Added _library suffix to json, blobmsg_json and ubox variables. --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96ebd47..db522d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,16 +16,16 @@ FIND_PATH(json_include_dir json-c/json.h json/json.h json.h) INCLUDE_DIRECTORIES(${ubox_include_dir} ${blobmsg_json_include_dir} ${json_include_dir}) IF(BUILD_STATIC) - FIND_LIBRARY(json NAMES libjson.a libjson-c.a) - FIND_LIBRARY(blobmsg_json NAMES libblobmsg_json.a) - FIND_LIBRARY(ubox NAMES libubox.a) + FIND_LIBRARY(json_library NAMES libjson.a libjson-c.a) + FIND_LIBRARY(blobmsg_json_library NAMES libblobmsg_json.a) + FIND_LIBRARY(ubox_library NAMES libubox.a) ELSE(BUILD_STATIC) - FIND_LIBRARY(json NAMES json-c json) - FIND_LIBRARY(blobmsg_json NAMES blobmsg_json) - FIND_LIBRARY(ubox NAMES ubox) + FIND_LIBRARY(json_library NAMES json-c json) + FIND_LIBRARY(blobmsg_json_library NAMES blobmsg_json) + FIND_LIBRARY(ubox_library NAMES ubox) ENDIF(BUILD_STATIC) -SET(LIBS ${ubox} ${blobmsg_json} ${json}) +SET(LIBS ${ubox_library} ${blobmsg_json_library} ${json_library}) IF(DEBUG_PACKET) ADD_DEFINITIONS(-DDEBUG_PACKET) -- 2.25.1