Skip to content
Permalink
Browse files

fix link if system json lib exists

  • Loading branch information
proller authored and kwolekr committed Mar 6, 2013
1 parent 5af8acf commit dd8593f2d6c1db06035be2e55a518109b74fc3b2
Showing with 7 additions and 7 deletions.
  1. +5 −5 cmake/Modules/FindJson.cmake
  2. +2 −2 src/json/CMakeLists.txt
@@ -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)
@@ -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}
)

0 comments on commit dd8593f

Please sign in to comment.