mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-20 05:30:26 +08:00
a0126a86e7
* [ryml] Add new port * Remove deprecated include * Fix ver regarding maintainer guide * Mark port as unsupport arm/arm64/osx * Update CI baseline * Replace deprecated func vcpkg_extract_source_archive, add PREFER_NINJA to conf * Fix wrong placed port states * Resolve merge conflict
35 lines
879 B
Diff
35 lines
879 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3e4eb23..115b8aa 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,4 +1,5 @@
|
|
cmake_minimum_required(VERSION 3.9)
|
|
+
|
|
project(ryml)
|
|
|
|
include(./ext/c4core/cmake/c4Project.cmake)
|
|
@@ -19,8 +20,7 @@ option(RYML_BUILD_API "Enable API generation (python, etc)" OFF)
|
|
|
|
#-------------------------------------------------------
|
|
|
|
-c4_require_subproject(c4core INCORPORATE
|
|
- SUBDIRECTORY ${RYML_EXT_DIR}/c4core)
|
|
+find_package(c4core CONFIG REQUIRED)
|
|
|
|
c4_add_library(ryml
|
|
SOURCES
|
|
@@ -46,10 +46,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(NOT RYML_DEFAULT_CALLBACKS)
|
|
|