summaryrefslogtreecommitdiff
path: root/0002-Export-targets.patch
diff options
context:
space:
mode:
authorMartchus <martchus@gmx.net>2017-07-03 22:47:23 +0200
committerMartchus <martchus@gmx.net>2017-07-03 22:48:25 +0200
commitaf282b9276d83cfd9a0705e27eb840d6dc8ba058 (patch)
tree77e113c80beb6bf637b9508437ddd744af398866 /0002-Export-targets.patch
parent13f0799ec3ceb45e07cda4a79417d7272cf576c2 (diff)
downloadpistache-git-af282b9276d83cfd9a0705e27eb840d6dc8ba058.tar.xz
pistache-git-af282b9276d83cfd9a0705e27eb840d6dc8ba058.zip
Update to 189.9827cda
Diffstat (limited to '0002-Export-targets.patch')
-rw-r--r--0002-Export-targets.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/0002-Export-targets.patch b/0002-Export-targets.patch
deleted file mode 100644
index e390688..0000000
--- a/0002-Export-targets.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 431986f951f5f5b3028e9262eed0e56d0f861dee Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Thu, 23 Mar 2017 20:50:21 +0100
-Subject: [PATCH 2/2] Export targets
-
----
- CMakeLists.txt | 2 +-
- src/CMakeLists.txt | 29 +++++++++++++++++++++++++++--
- src/PistacheConfig.cmake.in | 4 ++++
- 3 files changed, 32 insertions(+), 3 deletions(-)
- create mode 100644 src/PistacheConfig.cmake.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e2c9916..0197e24 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required (VERSION 2.8.7)
-+cmake_minimum_required (VERSION 3.0.2)
- project (pistache)
- include(CheckCXXCompilerFlag)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 60902dd..c1d88e4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,9 +10,34 @@ set(SOURCE_FILES
-
- add_library(pistache_static ${SOURCE_FILES})
- target_link_libraries(pistache_static pthread)
--install(TARGETS pistache_static DESTINATION lib)
-+install(TARGETS pistache_static
-+ EXPORT PistacheStaticTargets
-+ DESTINATION lib)
-+install(EXPORT PistacheStaticTargets
-+ DESTINATION "lib/cmake/pistache"
-+ EXPORT_LINK_INTERFACE_LIBRARIES
-+ COMPONENT cmake-config
-+)
-
- add_library(pistache SHARED ${SOURCE_FILES})
- target_link_libraries(pistache pthread)
--install(TARGETS pistache DESTINATION lib)
-+install(TARGETS pistache
-+ EXPORT PistacheSharedTargets
-+ DESTINATION lib)
-+install(EXPORT PistacheSharedTargets
-+ DESTINATION "lib/cmake/pistache"
-+ EXPORT_LINK_INTERFACE_LIBRARIES
-+ COMPONENT cmake-config
-+)
-
-+include(CMakePackageConfigHelpers)
-+configure_package_config_file(
-+ "PistacheConfig.cmake.in"
-+ "${CMAKE_CURRENT_BINARY_DIR}/PistacheConfig.cmake"
-+ INSTALL_DESTINATION "lib/cmake/pistache"
-+)
-+install(
-+ FILES "${CMAKE_CURRENT_BINARY_DIR}/PistacheConfig.cmake"
-+ DESTINATION "lib/cmake/pistache"
-+ COMPONENT cmake-config
-+)
-diff --git a/src/PistacheConfig.cmake.in b/src/PistacheConfig.cmake.in
-new file mode 100644
-index 0000000..a5dca28
---- /dev/null
-+++ b/src/PistacheConfig.cmake.in
-@@ -0,0 +1,4 @@
-+@PACKAGE_INIT@
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/PistacheSharedTargets.cmake")
-+include("${CMAKE_CURRENT_LIST_DIR}/PistacheStaticTargets.cmake")
---
-2.12.1
-