1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
|
From: Sebastian Kuzminsky <sebastiankuzminsky@desktopmetal.com>
Date: Thu, 19 May 2022 12:39:49 -0600
Subject: fix USE_SYSTEM_LIBS for rapidjson
---
CMakeLists.txt | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60bb46f..233d8e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,14 +277,18 @@ else()
endif ()
endif ()
-find_package(rapidjson 1.1.0 QUIET)
-if (NOT TARGET rapidjson::rapidjson)
- add_library(rapidjson::rapidjson INTERFACE)
- target_include_directories(rapidjson::rapidjson
- PUBLIC
- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/libs/clipper/include>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
- )
+if(USE_SYSTEM_LIBS)
+ find_package(RapidJSON CONFIG REQUIRED)
+else()
+ find_package(rapidjson 1.1.0 QUIET)
+ if (NOT TARGET rapidjson::rapidjson)
+ add_library(rapidjson::rapidjson INTERFACE)
+ target_include_directories(rapidjson::rapidjson
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/libs/clipper/include>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ )
+ endif()
endif()
find_package(stb REQUIRED)
|