mirror of https://github.com/microsoft/vcpkg.git
38 lines
948 B
Diff
38 lines
948 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index cd11625..4fb8872 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -30,10 +30,7 @@ option(RYML_INSTALL "Enable install target" ON)
|
|
|
|
#-------------------------------------------------------
|
|
|
|
-c4_require_subproject(c4core INCORPORATE
|
|
- SUBDIRECTORY ${RYML_EXT_DIR}/c4core
|
|
- OVERRIDE C4CORE_INSTALL ${RYML_INSTALL}
|
|
-)
|
|
+find_package(c4core CONFIG REQUIRED)
|
|
|
|
c4_add_library(ryml
|
|
SOURCES
|
|
@@ -84,10 +81,10 @@ c4_add_library(ryml
|
|
ryml.natvis
|
|
SOURCE_ROOT ${RYML_SRC_DIR}
|
|
INC_DIRS
|
|
+ $<BUILD_INTERFACE:${C4CORE_INCLUDE_DIR}>
|
|
$<BUILD_INTERFACE:${RYML_SRC_DIR}>
|
|
$<INSTALL_INTERFACE:include>
|
|
- LIBS c4core
|
|
- INCORPORATE c4core
|
|
+ LIBS c4core::c4core
|
|
)
|
|
|
|
if(RYML_WITH_TAB_TOKENS)
|
|
@@ -177,7 +174,6 @@ endif()
|
|
if(RYML_INSTALL)
|
|
c4_install_target(ryml)
|
|
c4_install_exports(DEPENDENCIES c4core)
|
|
- c4_pack_project()
|
|
endif()
|
|
|
|
|