Skip to content

Commit

Permalink
build: added _library suffix to lib variables
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
initdamg authored and Felix Fietkau committed Nov 22, 2015
1 parent 2333773 commit e92c1f8
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e92c1f8

Please sign in to comment.