From dd8593f2d6c1db06035be2e55a518109b74fc3b2 Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 6 Mar 2013 00:51:05 +0400 Subject: fix link if system json lib exists --- cmake/Modules/FindJson.cmake | 10 +++++----- src/json/CMakeLists.txt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake index bc4e71a29..a9178a225 100644 --- a/cmake/Modules/FindJson.cmake +++ b/cmake/Modules/FindJson.cmake @@ -2,17 +2,17 @@ #FIND_PATH(JSON_INCLUDE_DIR json.h) -#FIND_LIBRARY(JSON_LIBRARY NAMES json) +#FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp) #IF(JSON_LIBRARY AND JSON_INCLUDE_DIR) # SET( JSON_FOUND TRUE ) #ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR) #IF(JSON_FOUND) -# MESSAGE(STATUS "Found system json header file in ${JSON_INCLUDE_DIR}") -# MESSAGE(STATUS "Found system json library ${JSON_LIBRARY}") +# MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}") +# MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}") #ELSE(JSON_FOUND) SET(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json) - SET(JSON_LIBRARY json) - MESSAGE(STATUS "Using project json library") + SET(JSON_LIBRARY jsoncpp) + MESSAGE(STATUS "Using project jsoncpp library") #ENDIF(JSON_FOUND) diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt index 0957799aa..5887d523a 100644 --- a/src/json/CMakeLists.txt +++ b/src/json/CMakeLists.txt @@ -6,9 +6,9 @@ else( UNIX ) set(json_platform_LIBS "") endif( UNIX ) -add_library(json ${json_SRCS}) +add_library(jsoncpp ${json_SRCS}) target_link_libraries( - json + jsoncpp ${json_platform_LIBS} ) -- cgit v1.2.3