build: added _library suffix to lib variables
authorBachtin, Dmitri <dbachtin@init-ka.de>
Fri, 20 Nov 2015 06:34:36 +0000 (07:34 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 22 Nov 2015 11:37:21 +0000 (12:37 +0100)
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

index 96ebd47c678613a0a91027b65fdb8e53a65da82c..db522d31f0a03b6c7ea7acc7dbd745996a1be48a 100644 (file)
@@ -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)