[build] fixed cJSON dependency
need to find_package at top level so symbols are defined for add_library and target_*
This commit is contained in:
parent
47ad94e4f9
commit
8219c30eef
@ -82,6 +82,10 @@ macro (freerdp_definition_add)
|
||||
set (LIBFREERDP_DEFINITIONS ${LIBFREERDP_DEFINITIONS} PARENT_SCOPE)
|
||||
endmacro()
|
||||
|
||||
find_package(cJSON REQUIRED)
|
||||
freerdp_include_directory_add(${CJSON_INCLUDE_DIRS})
|
||||
freerdp_library_add(${CJSON_LIBRARIES})
|
||||
|
||||
if (WITH_SWSCALE)
|
||||
find_package(SWScale REQUIRED)
|
||||
endif(WITH_SWSCALE)
|
||||
|
@ -18,11 +18,6 @@
|
||||
set(MODULE_NAME "freerdp-core")
|
||||
set(MODULE_PREFIX "FREERDP_CORE")
|
||||
|
||||
find_package(cJSON REQUIRED)
|
||||
|
||||
freerdp_include_directory_add(${CJSON_INCLUDE_DIRS})
|
||||
freerdp_library_add(${CJSON_LIBRARIES})
|
||||
|
||||
freerdp_definition_add(-DEXT_PATH="${FREERDP_EXTENSION_PATH}")
|
||||
|
||||
freerdp_include_directory_add(${OPENSSL_INCLUDE_DIR})
|
||||
|
Loading…
Reference in New Issue
Block a user