diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-03-01 10:24:02 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-03-07 20:07:34 +1000 |
| commit | 5124d6cc06f112a93de3801f56cc80a554753aec (patch) | |
| tree | e066ddd450f1e41b7442b3ab52b3e5fce08b57b4 /cmake | |
| parent | fdd070b3a8c4cdcec69d9e3461f884e9aa2503b8 (diff) | |
[cmake] FindRapidJSON utilise automated variables
Use automated BYPRODUCT, INCLUDE_DIRS, LIBRARY, VER variables
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindRapidJSON.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/modules/FindRapidJSON.cmake b/cmake/modules/FindRapidJSON.cmake index 1a3fb60800..b8d6c49390 100644 --- a/cmake/modules/FindRapidJSON.cmake +++ b/cmake/modules/FindRapidJSON.cmake @@ -20,8 +20,7 @@ if(ENABLE_INTERNAL_RapidJSON) set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}") endif() - set(RapidJSON_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/librapidjson.a) - set(RapidJSON_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include) + set(RapidJSON_INCLUDE_DIR ${${MODULE}_INCLUDE_DIR}) set(RapidJSON_VERSION ${${MODULE}_VER}) set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} @@ -32,7 +31,7 @@ if(ENABLE_INTERNAL_RapidJSON) -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF "${EXTRA_ARGS}") set(PATCH_COMMAND patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/target/rapidjson/0001-remove_custom_cxx_flags.patch) - set(BUILD_BYPRODUCTS ${RapidJSON_LIBRARY}) + set(BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include/rapidjson/rapidjson.h) BUILD_DEP_TARGET() else() |