aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkreuzerkrieg <kreuzerkrieg@gmail.com>2020-04-27 17:59:52 +0300
committerGitHub <noreply@github.com>2020-04-27 07:59:52 -0700
commitce08802d88ccd31c0b608f82e9281508808e45ca (patch)
tree0d71fb90c45bb772d8f22424a1b507c6cb49b13d
parentaedd6c30a075c0507aae2e3dfacdcdea175d26af (diff)
downloadvcpkg-ce08802d88ccd31c0b608f82e9281508808e45ca.tar.gz
vcpkg-ce08802d88ccd31c0b608f82e9281508808e45ca.zip
[murmurhash] Installation fix (#11011)
-rw-r--r--ports/murmurhash/CMakeLists.txt8
-rw-r--r--ports/murmurhash/CONTROL2
-rw-r--r--ports/murmurhash/portfile.cmake2
3 files changed, 2 insertions, 10 deletions
diff --git a/ports/murmurhash/CMakeLists.txt b/ports/murmurhash/CMakeLists.txt
index 681f9592c..89cf96b2b 100644
--- a/ports/murmurhash/CMakeLists.txt
+++ b/ports/murmurhash/CMakeLists.txt
@@ -9,7 +9,6 @@ add_library(murmurhash
src/MurmurHash2.cpp
src/MurmurHash3.cpp
)
-target_include_directories(murmurhash SYSTEM PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/src)
set(MURMUR_HEADERS
src/MurmurHash2.h
@@ -29,17 +28,10 @@ set(namespace "${PROJECT_NAME}::")
include(CMakePackageConfigHelpers)
-# Configure '<PROJECT-NAME>ConfigVersion.cmake'
-# Use:
-# * PROJECT_VERSION
write_basic_package_version_file(
"${version_config}" COMPATIBILITY SameMajorVersion
)
-# Configure '<PROJECT-NAME>Config.cmake'
-# Use variables:
-# * TARGETS_EXPORT_NAME
-# * PROJECT_NAME
configure_package_config_file(
"${CMAKE_SOURCE_DIR}/Config.cmake.in"
"${project_config}"
diff --git a/ports/murmurhash/CONTROL b/ports/murmurhash/CONTROL
index 9c12b4a76..5f640c40c 100644
--- a/ports/murmurhash/CONTROL
+++ b/ports/murmurhash/CONTROL
@@ -1,4 +1,4 @@
Source: murmurhash
-Version: 2016-01-09
+Version: 2016-01-09-2
Homepage: https://github.com/aappleby/smhasher
Description: MurmurHash a family of hash functions.
diff --git a/ports/murmurhash/portfile.cmake b/ports/murmurhash/portfile.cmake
index 83e1fd1fa..380570b2f 100644
--- a/ports/murmurhash/portfile.cmake
+++ b/ports/murmurhash/portfile.cmake
@@ -18,7 +18,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)