diff --git a/cmake/InstallRules.cmake b/cmake/InstallRules.cmake index 5087cbb..529e51a 100644 --- a/cmake/InstallRules.cmake +++ b/cmake/InstallRules.cmake @@ -63,7 +63,13 @@ install( ) # Findzstd.cmake -install(FILES "${PROJECT_SOURCE_DIR}/cmake/Findzstd.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}") +# vcpkg doesn't like anything being put in share/, which is where this goes apparently on their setup +if(NOT CPPTRACE_VCPKG) + install( + FILES "${PROJECT_SOURCE_DIR}/cmake/Findzstd.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}" + ) +endif() # support packaging library if(PROJECT_IS_TOP_LEVEL) diff --git a/cmake/in/cpptrace-config-cmake.in b/cmake/in/cpptrace-config-cmake.in index a128d52..fc017ad 100644 --- a/cmake/in/cpptrace-config-cmake.in +++ b/cmake/in/cpptrace-config-cmake.in @@ -4,11 +4,16 @@ # Dependencies if(@CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF@) include(CMakeFindDependencyMacro) - set(CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}") - set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}") - find_dependency(zstd) - set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH_OLD}") - unset(CMAKE_MODULE_PATH_OLD) + # we don't go the Findzstd.cmake route on vcpkg + if(@CPPTRACE_VCPKG@) + find_dependency(zstd CONFIG REQUIRED) + else() + set(CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}") + set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}") + find_dependency(zstd) + set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH_OLD}") + unset(CMAKE_MODULE_PATH_OLD) + endif() find_dependency(libdwarf REQUIRED) endif()