forked from Mirrorlandia_minetest/minetest
fix link if system json lib exists
This commit is contained in:
parent
5af8acfa6e
commit
dd8593f2d6
@ -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}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user