diff options
| author |   Bachtin, Dmitri <dbachtin@init-ka.de> | 2015-11-20 07:34:36 +0100 |
|---|---|---|
| committer |   Felix Fietkau <nbd@openwrt.org> | 2015-11-22 12:37:21 +0100 |
| commit | e92c1f88d6dbd1d8dd955f198b5cc47b58688c57 (patch) | |
| tree | 23dbf446da83c5970f857be7897b6d2d88128e95 | |
| parent | 23337736a43845ff5b24b7ab8556572d703cd294 (diff) | |
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.
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files 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) |