mirror of https://github.com/microsoft/vcpkg.git
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 7419418a..f3e9dab2 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -97,7 +97,7 @@ c4_add_library(ryml
|
|
)
|
|
|
|
if(RYML_SYSTEM_C4CORE)
|
|
- find_package(c4core REQUIRED)
|
|
+ find_package(c4core CONFIG REQUIRED)
|
|
target_link_libraries(ryml PUBLIC c4core::c4core)
|
|
elseif(NOT RYML_STANDALONE)
|
|
target_link_libraries(ryml PUBLIC c4core)
|
|
@@ -200,11 +200,10 @@ endif()
|
|
if(RYML_INSTALL)
|
|
c4_install_target(ryml)
|
|
if(RYML_STANDALONE OR RYML_SYSTEM_C4CORE)
|
|
- c4_install_exports()
|
|
+ c4_install_exports(DEPENDENCIES c4core)
|
|
else()
|
|
c4_install_exports(DEPENDENCIES c4core)
|
|
endif()
|
|
- c4_pack_project()
|
|
endif()
|
|
|
|
# generate and install the install manifest
|
|
@@ -216,7 +215,6 @@ list(SORT ryml_manifest)\n\
|
|
string(REPLACE \";\" \"\\n\" ryml_manifest \"\$\{ryml_manifest\}\")\n\
|
|
file(WRITE ${CMAKE_BINARY_DIR}/MANIFEST.txt \"\$\{ryml_manifest\}\")
|
|
")
|
|
-install(FILES "${CMAKE_BINARY_DIR}/MANIFEST.txt" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ryml)
|
|
|
|
# add a target to uninstall
|
|
add_custom_target(ryml-uninstall
|
|
diff --git a/proj/c4proj/c4Project.cmake b/proj/c4proj/c4Project.cmake
|
|
index 56d84b47..67d99253 100644
|
|
--- a/proj/c4proj/c4Project.cmake
|
|
+++ b/proj/c4proj/c4Project.cmake
|
|
@@ -2694,7 +2694,7 @@ include(CMakeFindDependencyMacro)
|
|
continue()
|
|
endif()
|
|
c4_dbg("install: adding dependency check for ${d}")
|
|
- set(deps "${deps}find_dependency(${d} REQUIRED)
|
|
+ set(deps "${deps}find_dependency(${d})
|
|
")
|
|
endforeach()
|
|
set(deps "${deps}#-----------------------------")
|