vcpkg/ports/yomm2/fix_install.patch

48 lines
1.6 KiB
Diff
Raw Normal View History

2021-05-27 01:33:43 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e8a282..f550c2d 100644
2021-05-27 01:33:43 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
2021-05-27 01:33:43 +08:00
# Find Boost dependency
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
include(find_or_download_package)
-find_or_download_package(Boost INSTALL_WITH_YOMM)
+find_package(Boost REQUIRED)
message(STATUS "Using Boost libraries from ${Boost_INCLUDE_DIRS}")
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
index 7272504..6423a17 100644
2021-05-27 01:33:43 +08:00
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -1,7 +1,7 @@
include(CMakeFindDependencyMacro)
# Tell library users about the Boost dependency
-find_dependency(Boost 1.53 HINTS ${CMAKE_CURRENT_LIST_DIR}/..)
+find_dependency(Boost REQUIRED)
2021-05-27 01:33:43 +08:00
# Add the targets file
include("${CMAKE_CURRENT_LIST_DIR}/YOMM2Targets.cmake")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e8a282..f550c2d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,6 +29,5 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
target_include_directories(
yomm2 INTERFACE
$<BUILD_INTERFACE:${YOMM2_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
- $<INSTALL_INTERFACE:Boost::yomm2>
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -36,5 +36,6 @@
install(TARGETS yomm2
EXPORT YOMM2Targets
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION bin
)