[rttr] Use from github, slight patch simplification.

This commit is contained in:
Robert Schumacher 2018-02-24 02:26:31 -08:00
parent 6d3fb52c70
commit ca7f50e598
2 changed files with 14 additions and 37 deletions

View File

@ -1,16 +1,3 @@
diff --git a/CMake/config.cmake b/CMake/config.cmake
index 1d753b3..02fe814 100644
--- a/CMake/config.cmake
+++ b/CMake/config.cmake
@@ -124,7 +124,7 @@ install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/CMake/rttr-config-version.cmake"
DESTINATION
- cmake
+ share/rttr
COMPONENT
Devel
)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d64ee41..e33e7bf 100644
--- a/CMakeLists.txt
@ -21,16 +8,3 @@ index d64ee41..e33e7bf 100644
# here we specify the installation directory
-set(CMAKE_INSTALL_PREFIX ${RTTR_INSTALL_DIR} CACHE PATH "RTTR install prefix" FORCE)
+set(CMAKE_INSTALL_PREFIX ${RTTR_INSTALL_DIR} CACHE PATH "RTTR install prefix")
diff --git a/src/rttr/CMakeLists.txt b/src/rttr/CMakeLists.txt
index 3dffa2c..405b377 100644
--- a/src/rttr/CMakeLists.txt
+++ b/src/rttr/CMakeLists.txt
@@ -47,7 +47,7 @@ install(TARGETS rttr_core EXPORT rttr_targets
ARCHIVE DESTINATION ${RTTR_LIB_INSTALL_DIR})
install(EXPORT rttr_targets
- DESTINATION cmake
+ DESTINATION share/rttr
NAMESPACE RTTR::
FILE rttr-config.cmake)

View File

@ -1,19 +1,22 @@
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
message("Rttr only supports dynamic library linkage")
set(VCPKG_LIBRARY_LINKAGE "dynamic")
message("Rttr only supports dynamic library linkage")
set(VCPKG_LIBRARY_LINKAGE "dynamic")
endif()
if(VCPKG_CRT_LINKAGE STREQUAL "static")
message(FATAL_ERROR "Rttr only supports dynamic library linkage, so cannot be built with static CRT")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rttr-0.9.5-src)
vcpkg_download_distfile(ARCHIVE
URLS "http://www.rttr.org/releases/rttr-0.9.5-src.zip"
FILENAME "rttr-0.9.5-src.zip"
SHA512 49110cb588d2dd40a42de34b21a898fe7e21bd1e57f33b9183292c9e7cb8c8aa9e811e24613854a91e97d5cee2e561b430d89deab9f715081a3c6a1866966258
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rttrorg/rttr
REF v0.9.5
SHA512 b451f24fd4bdc4b7d9ecabdb6fd261744852e68357ec36573109354a25f2bf494908b9d4174602b59dd5005c42ba8edc3b35ec1d1386384db421805ac9994608
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rttr-0.9.5-src
SOURCE_PATH ${SOURCE_PATH}
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/fix-directory-output.patch"
"${CMAKE_CURRENT_LIST_DIR}/disable-unit-tests.patch"
@ -26,14 +29,14 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
#Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rttr)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/rttr/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/rttr/copyright)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/cmake
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share
${CURRENT_PACKAGES_DIR}/debug/README.md
${CURRENT_PACKAGES_DIR}/debug/LICENSE.txt
${CURRENT_PACKAGES_DIR}/LICENSE.txt